@rr0/cms 0.1.23 → 0.2.0

package/dist/time/datasource/ChronologyReplacer.js

@@ -97,11 +97,8 @@ export class ChronologyReplacer {
         const casesToMerge = sourceCases.map(sourceCase => mapping.mapper.map(context, sourceCase, fetchTime));
         const casesToAdd = [];
         for (const caseToMerge of casesToMerge) {
-            const foundExisting = existingCases.find(existingCase => {
-                var _a, _b;
-                return existingCase.time.equals(caseToMerge.time)
-                    && ((_a = existingCase.place) === null || _a === void 0 ? void 0 : _a.name) === ((_b = caseToMerge.place) === null || _b === void 0 ? void 0 : _b.name);
-            });
+            const foundExisting = existingCases.find(existingCase => existingCase.time.isEqual(caseToMerge.time)
+                && existingCase.place === caseToMerge.place);
             if (foundExisting) {
                 context.logger.debug("Merging ", caseToMerge, " into ", foundExisting);
             }

package/dist/time/datasource/ChronologyReplacer.test.js

@@ -1,13 +1,13 @@
 import { beforeEach, describe, test } from "@javarome/testscript";
 import { ChronologyReplacer } from "./ChronologyReplacer.js";
 import { CaseSummaryRenderer } from "../CaseSummaryRenderer.js";
-import { urecatRR0Mapping } from "./urecat/index.js";
 import { rr0TestUtil } from "../../test/index.js";
 import { SourceFactory, SourceRenderer } from "../../source/index.js";
 import { NoteFileCounter, NoteRenderer } from "../../note/index.js";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { HttpSource } from "./HttpSource.js";
 import { AllDataService } from "@rr0/data";
+import { UrecatRR0Mapping } from "./urecat";
 describe("ChronologyReplacer", () => {
     let context;
     let chronologyReplacer;
@@ -19,6 +19,7 @@ describe("ChronologyReplacer", () => {
         const sourceFactory = new SourceFactory(dataService, http, baseUrl, rr0TestUtil.intlOptions, timeTestUtil.getService());
         const timeTextBuilder = new TimeTextBuilder(rr0TestUtil.intlOptions);
         const caseRenderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(timeTextBuilder), timeTestUtil.timeElementFactory);
+        const urecatRR0Mapping = new UrecatRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.countryService, { read: ["fetch"], write: ["backup"] });
         chronologyReplacer = new ChronologyReplacer([urecatRR0Mapping], caseRenderer);
         context = timeTestUtil.newHtmlContext("index.html");
         context.time.setYear(undefined);

package/dist/time/datasource/CsvMapper.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export class CsvMapper {
     constructor(sep = ",", escapeStr = "\"", prefix = "") {
         this.sep = sep;
@@ -14,7 +14,7 @@ export class CsvMapper {
             else if (typeof value === "string") {
                 val = this.escape(value);
             }
-            else if (value instanceof URL || value instanceof TimeContext) {
+            else if (value instanceof URL || value instanceof EdtfDate) {
                 val = value.toString();
             }
             else if (Array.isArray(value)) {

package/dist/time/datasource/DatasourceTestCase.d.ts

@@ -1,18 +1,20 @@
 import { HtmlRR0Context } from "../../RR0Context.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { TimeTextBuilder } from "../text/TimeTextBuilder.js";
 import { RR0CaseMapping } from "./rr0/index.js";
 import { Source } from "@rr0/data/dist/source";
+import { PlaceRenderer } from "../../place/PlaceRenderer";
 export declare abstract class DatasourceTestCase<S> {
     readonly mapping: RR0CaseMapping<S>;
     readonly sourceCases: S[];
     protected readonly intlOptions: Intl.DateTimeFormatOptions;
     timeTextBuilder: TimeTextBuilder;
+    placeRenderer: PlaceRenderer;
     protected constructor(mapping: RR0CaseMapping<S>, sourceCases: S[], intlOptions?: Intl.DateTimeFormatOptions);
     checkCaseHTML(context: HtmlRR0Context, nativeCase: S, item: HTMLLIElement, dataDate: Date): void;
     testRender(context: HtmlRR0Context): Promise<void>;
     testFetch(context: HtmlRR0Context): Promise<void>;
     protected abstract sortComparator(c1: S, c2: S): number;
-    protected abstract getTime(c: S): TimeContext;
+    protected abstract getTime(c: S): EdtfDate;
     protected expectedSourceStr(context: HtmlRR0Context, expectedSources: Source[], nativeCase: S): string;
 }

package/dist/time/datasource/DatasourceTestCase.js

@@ -8,6 +8,7 @@ import { TimeElementFactory } from "../html/TimeElementFactory.js";
 import { TimeRenderer } from "../html/TimeRenderer.js";
 import { rr0TestUtil } from "../../test";
 import { AllDataService } from "@rr0/data";
+import { PlaceRenderer } from "../../place/PlaceRenderer";
 export class DatasourceTestCase {
     constructor(mapping, sourceCases, intlOptions = {
         year: "numeric",
@@ -22,6 +23,7 @@ export class DatasourceTestCase {
         this.sourceCases = sourceCases;
         this.intlOptions = intlOptions;
         this.timeTextBuilder = new TimeTextBuilder(this.intlOptions);
+        this.placeRenderer = new PlaceRenderer();
     }
     checkCaseHTML(context, nativeCase, item, dataDate) {
         const expected = this.mapping.mapper.map(context, nativeCase, dataDate);
@@ -29,7 +31,7 @@ export class DatasourceTestCase {
         const caseContext = context.clone();
         Object.assign(caseContext, { time });
         const timeStr = this.timeTextBuilder.build(caseContext);
-        const placeStr = expected.place ? ` À <span class="place">${expected.place.name}</span>` : "";
+        const placeStr = expected.place ? this.placeRenderer.render(context, expected.place) : "";
         const expectedSources = expected.sources;
         const sourceStr = (expectedSources === null || expectedSources === void 0 ? void 0 : expectedSources.length) > 0 ? this.expectedSourceStr(context, expectedSources, nativeCase) : "";
         expect(item.innerHTML).toBe(`<time datetime="${time.toString()}">${timeStr}</time>${placeStr}, ${expected.description}${sourceStr}.`);
@@ -68,7 +70,7 @@ export class DatasourceTestCase {
         const datasource = this.mapping.datasource;
         const source = expectedSources[0];
         const sourceContext = context.clone();
-        sourceContext.time = source.publication.time;
+        sourceContext.time.date = source.publication.time;
         const publicationStr = source.publication ? `, ${this.timeTextBuilder.build(sourceContext)}` : "";
         const indexStr = source.index ? `, ${source.index}` : "";
         const authorStr = datasource.authors.map(authorStr => `<span class="people">${authorStr}</span>`).join(" &amp; ");

package/dist/time/datasource/JsonMapper.test.js

@@ -1,15 +1,17 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
 import fs from "fs";
-import { ufoSearchFileDatasource } from "./ufo-search/index.js";
 import { rr0TestUtil } from "../../test/index.js";
 import { ufoSearchTestCases } from "./ufo-search/UfoSearchTestCases.js";
 import path from "path";
+import { UfoSearchRR0Mapping } from "./ufo-search";
 describe("JsonMapper", () => {
     let context;
     beforeEach(() => {
         context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html", undefined, "en");
     });
     test("read", () => {
+        const ufoSearchMapping = new UfoSearchRR0Mapping(rr0TestUtil.cityService, { read: ["fetch"], write: ["backup"] });
+        const ufoSearchFileDatasource = ufoSearchMapping.backupDatasource;
         const data = fs.readFileSync(path.join("src", ufoSearchFileDatasource.fileName), { encoding: "utf-8" });
         const cases = ufoSearchFileDatasource.fileMapper.parse(context, data);
         expect(cases.length).toEqual(54751);

package/dist/time/datasource/TimeContextFilter.d.ts

@@ -1,8 +1,8 @@
 import { ContextFilter } from "./ContextFilter.js";
 import { RR0Context } from "../../RR0Context.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export interface TimeContextCase {
-    time?: TimeContext;
+    time?: EdtfDate;
 }
 export declare class TimeContextFilter<S extends TimeContextCase> extends ContextFilter<S> {
     constructor(context: RR0Context);

package/dist/time/datasource/TimeContextFilter.js

@@ -4,13 +4,14 @@ export class TimeContextFilter extends ContextFilter {
         super(context);
     }
     filter(c) {
+        var _a, _b, _c;
         const sightingTime = c.time;
         const time = this.context.time;
         if (time) {
             const day = time.getDayOfMonth();
             const month = time.getMonth();
             const year = time.getYear();
-            return (!year || year === sightingTime.getYear()) && (!month || month === sightingTime.getMonth()) && (!day || day === sightingTime.getDayOfMonth());
+            return (!year || year === ((_a = sightingTime.year) === null || _a === void 0 ? void 0 : _a.value)) && (!month || month === ((_b = sightingTime.month) === null || _b === void 0 ? void 0 : _b.value)) && (!day || day === ((_c = sightingTime.day) === null || _c === void 0 ? void 0 : _c.value));
         }
         else {
             return true;

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummary.d.ts

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export declare enum BaseOvniFranceTypeObservation {
     visualClose = "Visuel : proche",
     visualFar = "Visuel : Eloign\u00E9"
@@ -90,7 +90,7 @@ export declare enum BaseOvniFranceSize {
 export interface BaseOvniFranceCaseSummary {
     readonly id: string;
     readonly url: string;
-    readonly time: TimeContext;
+    readonly time: EdtfDate;
     readonly city: string;
     readonly depCode: string;
     /**

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryMapper.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate, Level2Timeshift } from "@rr0/time";
 /**
  * Maps a Base OVNI France CSV case to a Base OVNI France case.
  */
@@ -19,7 +19,14 @@ export class BaseOvniFranceCaseSummaryMapper {
             url: new URL("listgen.php?typlist=20&page=0&numobs=" + caseNumber, this.baseUrl).href,
             city: csvCase.Ville,
             depCode: csvCase["Départ."],
-            time: new TimeContext(parseInt(dateFields[2], 10), parseInt(dateFields[1], 10), dayOfMonth, parseInt(timeFields[0], 10), parseInt(timeFields[1], 10), "GMT+1"),
+            time: new EdtfDate({
+                year: parseInt(dateFields[2], 10),
+                month: parseInt(dateFields[1], 10),
+                day: dayOfMonth,
+                hour: parseInt(timeFields[0], 10),
+                minute: parseInt(timeFields[1], 10),
+                timeshift: Level2Timeshift.fromString("GMT+1")
+            }),
             physicalEffect: Boolean(csvCase["Effet Physique"]),
             witnessEffect: Boolean(csvCase["Effet témoin"]),
             entities: csvCase["Nbre entité"] > 0,

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.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 a Base OVNI France case to a RR0 case.
  */
@@ -15,7 +16,7 @@ export class BaseOvniFranceCaseSummaryRR0Mapper {
         const caseSource = {
             previousSourceRefs: [], events: [],
             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 depCode = sourceCase.depCode;
         const dep = this.depService.get(depCode, undefined);
@@ -23,12 +24,12 @@ export class BaseOvniFranceCaseSummaryRR0Mapper {
         const placeName = sourceCase.city;
         const city = this.cityService.find(context, placeName, dep);
         assert.ok(city, `Could not find city of name "${placeName}" in department of code "${dep.id}"`);
-        const place = { name: city.getTitle(context), place: city.places[0] };
         return {
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             events: [],
             time: sourceCase.time,
-            place,
+            place: new OrganizationPlace(city),
             description: this.getDescription(sourceCase),
             sources: [caseSource]
         };

package/dist/time/datasource/baseovnifrance/BaseOvniFranceCaseSummaryRR0Mapper.test.js

@@ -1,18 +1,19 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
-import { baseOvniFranceDatasource, baseOvniFranceRR0Mapper } from "./BaseOvniFranceRR0Mapping.js";
+import { baseOvniFranceDatasource } from "./BaseOvniFranceRR0Mapping.js";
 import { leMans72 } from "../../../org/eu/fr/region/pdl/72/LeMans/LeMans.js";
 import { lyon69 } from "../../../org/eu/fr/region/ara/69/Lyon/Lyon.js";
 import { briancon05 } from "../../../org/eu/fr/region/pac/05/briancon/Briancon.js";
 import { chambonSurVoueize23 } from "../../../org/eu/fr/region/naq/23/Chambon/Chambon.js";
+import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryRR0Mapper";
 function expectedSource(datasource, dataDate, caseNumber) {
     const url = new URL(datasource.searchPath + "?typlist=20&page=0&numobs=" + caseNumber, datasource.baseUrl).href;
     return {
         previousSourceRefs: [], events: [],
         url, title: "cas n° " + caseNumber, authors: datasource.authors,
-        publication: { publisher: datasource.copyright, time: TimeContext.fromDate(dataDate) }
+        publication: { publisher: datasource.copyright, time: EdtfDate.fromDate(dataDate) }
     };
 }
 describe("BaseOvniFranceCaseSource", () => {
@@ -24,6 +25,7 @@ describe("BaseOvniFranceCaseSource", () => {
     });
     test("map as RR0 cases", async () => {
         const dataDate = new Date("2024-08-12 00:00:00 GMT+1");
+        const baseOvniFranceRR0Mapper = new BaseOvniFranceCaseSummaryRR0Mapper(rr0TestUtil.departmentService, rr0TestUtil.cityService, baseOvniFranceDatasource.baseUrl, baseOvniFranceDatasource.copyright, baseOvniFranceDatasource.authors);
         const mapped = baseOvniFranceTestCases.map(sourceCase => baseOvniFranceRR0Mapper.map(context, sourceCase, dataDate));
         const nativeCase1 = baseOvniFranceTestCases[0];
         const nativeCase1Time = nativeCase1.time;
@@ -35,34 +37,38 @@ describe("BaseOvniFranceCaseSource", () => {
         const nativeCase4Time = nativeCase4.time;
         const expected = [
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase1Time.getYear(), nativeCase1Time.getMonth(), nativeCase1Time.getDayOfMonth(), nativeCase1Time.getHour(), nativeCase1Time.getMinutes(), nativeCase1Time.getTimeZone()),
-                place: { name: "Le Mans", place: leMans72.places[0] },
+                time: nativeCase1Time,
+                place: leMans72.places[0],
                 description: "observation",
                 sources: [expectedSource(baseOvniFranceDatasource, dataDate, nativeCase1.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase2Time.getYear(), nativeCase2Time.getMonth(), nativeCase2Time.getDayOfMonth(), nativeCase2Time.getHour(), nativeCase2Time.getMinutes(), nativeCase2Time.getTimeZone()),
-                place: { name: "Lyon", place: lyon69.places[0] },
+                time: nativeCase2Time,
+                place: lyon69.places[0],
                 description: "observation",
                 sources: [expectedSource(baseOvniFranceDatasource, dataDate, nativeCase2.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase3Time.getYear(), nativeCase3Time.getMonth(), nativeCase3Time.getDayOfMonth(), nativeCase3Time.getHour(), nativeCase3Time.getMinutes(), nativeCase3Time.getTimeZone()),
-                place: { name: "Briançon", place: briancon05.places[0] },
+                time: nativeCase3Time,
+                place: briancon05.places[0],
                 description: "observation",
                 sources: [expectedSource(baseOvniFranceDatasource, dataDate, nativeCase3.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase4Time.getYear(), nativeCase4Time.getMonth(), nativeCase4Time.getDayOfMonth(), nativeCase4Time.getHour(), nativeCase4Time.getMinutes(), nativeCase4Time.getTimeZone()),
-                place: { name: "Chambon-sur-Voueize", place: chambonSurVoueize23.places[0] },
+                time: nativeCase4Time,
+                place: chambonSurVoueize23.places[0],
                 description: "observation",
                 sources: [expectedSource(baseOvniFranceDatasource, dataDate, nativeCase4.id)]
             }

package/dist/time/datasource/baseovnifrance/BaseOvniFranceDatasource.test.js

@@ -2,8 +2,9 @@ import { beforeEach, describe, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
 import { baseOvniFranceTestCases } from "./BaseOvniFranceTestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
-import { baseOvniFranceRR0Mapping, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";
+import { BaseOvniFranceRR0Mapping, baseOvniFranceSortComparator } from "./BaseOvniFranceRR0Mapping.js";
 describe("BaseOvniFranceCaseSource", () => {
+    const baseOvniFranceRR0Mapping = new BaseOvniFranceRR0Mapping(rr0TestUtil.cityService, rr0TestUtil.departmentService, { read: ["fetch"], write: ["backup"] });
     const testCase = new class extends DatasourceTestCase {
         constructor(mapping, sourceCases) {
             super(mapping, sourceCases);

package/dist/time/datasource/baseovnifrance/BaseOvniFranceHttpDatasource.d.ts

@@ -1,7 +1,7 @@
 import { RR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { BaseOvniFranceCaseSummary } from "./BaseOvniFranceCaseSummary.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { BaseOvniFranceDatasource } from "./BaseOvniFranceDatasource.js";
 interface FormData {
     mois: string;
@@ -20,8 +20,8 @@ export declare class BaseOvniFranceHttpDatasource extends BaseOvniFranceDatasour
     };
     protected readCases(context: RR0Context): Promise<BaseOvniFranceCaseSummary[]>;
     protected getBoolean(field: HTMLTableCellElement): boolean;
-    protected getDate(context: RR0Context, dateField: HTMLTableCellElement): TimeContext;
-    protected setTime(dateTime: TimeContext, timeField: HTMLTableCellElement): void;
+    protected getDate(context: RR0Context, dateField: HTMLTableCellElement): EdtfDate;
+    protected setTime(dateTime: EdtfDate, timeField: HTMLTableCellElement): void;
     protected getFromRow(context: RR0Context, row: Element): BaseOvniFranceCaseSummary;
 }
 export {};

package/dist/time/datasource/baseovnifrance/BaseOvniFranceHttpDatasource.js

@@ -1,6 +1,7 @@
 import { HttpSource } from "../HttpSource.js";
 import { UrlUtil } from "../../../util/index.js";
 import { JSDOM } from "jsdom";
+import { Level2Date as EdtfDate, Level2Timeshift } from "@rr0/time";
 import assert from "assert";
 import { BaseOvniFranceDatasource } from "./BaseOvniFranceDatasource.js";
 var ListType;
@@ -49,22 +50,21 @@ export class BaseOvniFranceHttpDatasource extends BaseOvniFranceDatasource {
     getDate(context, dateField) {
         const dateFormat = /(\d\d)-(\d\d)-(\d\d\d\d)/;
         const dateFields = dateFormat.exec(dateField.textContent);
-        const itemContext = context.clone();
-        const dateTime = itemContext.time;
-        dateTime.setYear(parseInt(dateFields[3], 10));
-        dateTime.setMonth(parseInt(dateFields[2], 10));
         const dayOfMonth = dateFields[1];
-        dateTime.setDayOfMonth(dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined);
-        return dateTime;
+        return new EdtfDate({
+            year: parseInt(dateFields[3], 10),
+            month: parseInt(dateFields[2], 10),
+            day: dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined
+        });
     }
     setTime(dateTime, timeField) {
         const timeFormat = /(\d\d):(\d\d)/;
         const timeFields = timeFormat.exec(timeField.textContent);
         const hour = timeFields ? parseInt(timeFields[1], 10) : undefined;
         const minutes = timeFields ? parseInt(timeFields[2], 10) : undefined;
-        dateTime.setHour(hour);
-        dateTime.setMinutes(minutes);
-        dateTime.setTimeZone("GMT+1");
+        dateTime.hour = hour;
+        dateTime.minute = minutes;
+        dateTime.timeshift = Level2Timeshift.fromString("GMT+1");
     }
     getFromRow(context, row) {
         const columns = row.querySelectorAll("td");

package/dist/time/datasource/baseovnifrance/BaseOvniFranceRR0Mapping.d.ts

@@ -2,7 +2,13 @@ import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryR
 import { BaseOvniFranceCaseSummary } from "./BaseOvniFranceCaseSummary.js";
 import { BaseOvniFranceHttpDatasource } from "./BaseOvniFranceHttpDatasource.js";
 import { RR0CaseMapping } from "../rr0/index.js";
+import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
+import { CityService, DepartmentService } from "../../../org";
 export declare const baseOvniFranceDatasource: BaseOvniFranceHttpDatasource;
-export declare const baseOvniFranceRR0Mapper: BaseOvniFranceCaseSummaryRR0Mapper;
-export declare const baseOvniFranceRR0Mapping: RR0CaseMapping<BaseOvniFranceCaseSummary>;
+export declare class BaseOvniFranceRR0Mapping implements RR0CaseMapping<BaseOvniFranceCaseSummary> {
+    readonly actions: ChronologyReplacerActions;
+    readonly datasource: BaseOvniFranceHttpDatasource;
+    readonly mapper: BaseOvniFranceCaseSummaryRR0Mapper;
+    constructor(cityService: CityService, departmentService: DepartmentService, actions: ChronologyReplacerActions);
+}
 export declare const baseOvniFranceSortComparator: (c1: BaseOvniFranceCaseSummary, c2: BaseOvniFranceCaseSummary) => 0 | 1 | -1;

package/dist/time/datasource/baseovnifrance/BaseOvniFranceRR0Mapping.js

@@ -1,12 +1,11 @@
 import { BaseOvniFranceCaseSummaryRR0Mapper } from "./BaseOvniFranceCaseSummaryRR0Mapper.js";
 import { BaseOvniFranceHttpDatasource } from "./BaseOvniFranceHttpDatasource.js";
-import { cityService, departmentService } from "../../../org/index.js";
 export const baseOvniFranceDatasource = new BaseOvniFranceHttpDatasource();
-export const baseOvniFranceRR0Mapper = new BaseOvniFranceCaseSummaryRR0Mapper(departmentService, cityService, baseOvniFranceDatasource.baseUrl, baseOvniFranceDatasource.copyright, baseOvniFranceDatasource.authors);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const baseOvniFranceRR0Mapping = {
-    datasource: baseOvniFranceDatasource,
-    mapper: baseOvniFranceRR0Mapper,
-    actions
-};
+export class BaseOvniFranceRR0Mapping {
+    constructor(cityService, departmentService, actions) {
+        this.actions = actions;
+        const datasource = this.datasource = baseOvniFranceDatasource;
+        this.mapper = new BaseOvniFranceCaseSummaryRR0Mapper(departmentService, cityService, datasource.baseUrl, datasource.copyright, datasource.authors);
+    }
+}
 export const baseOvniFranceSortComparator = (c1, c2) => c1.id < c2.id ? -1 : c1.id > c2.id ? 1 : 0;

package/dist/time/datasource/baseovnifrance/BaseOvniFranceTestCases.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate, Level2Timeshift } from "@rr0/time";
 import { baseOvniFranceDatasource } from "./BaseOvniFranceRR0Mapping.js";
 export const baseOvniFranceTestCases = [
     {
@@ -6,7 +6,7 @@ export const baseOvniFranceTestCases = [
         url: new URL("listgen.php?typlist=20&page=0&numobs=2760", baseOvniFranceDatasource.baseUrl).href,
         city: "Le Mans",
         depCode: "72",
-        time: new TimeContext(1970, 3, undefined, 16, 0, "GMT+1"),
+        time: new EdtfDate({ year: 1970, month: 3, hour: 16, minute: 0, timeshift: Level2Timeshift.fromString("GMT+1") }),
         physicalEffect: false,
         witnessEffect: false,
         entities: false,
@@ -17,7 +17,7 @@ export const baseOvniFranceTestCases = [
         url: new URL("listgen.php?typlist=20&page=0&numobs=1650", baseOvniFranceDatasource.baseUrl).href,
         city: "Lyon",
         depCode: "69",
-        time: new TimeContext(1970, 3, 12, 7, 40, "GMT+1"),
+        time: new EdtfDate({ year: 1970, month: 3, day: 12, hour: 7, minute: 40, timeshift: Level2Timeshift.fromString("GMT+1") }),
         physicalEffect: false,
         witnessEffect: false,
         entities: false,
@@ -28,7 +28,7 @@ export const baseOvniFranceTestCases = [
         url: new URL("listgen.php?typlist=20&page=0&numobs=3088", baseOvniFranceDatasource.baseUrl).href,
         city: "Briançon",
         depCode: "05",
-        time: new TimeContext(1970, 3, 16, 20, 0, "GMT+1"),
+        time: new EdtfDate({ year: 1970, month: 3, day: 16, hour: 20, minute: 0, timeshift: Level2Timeshift.fromString("GMT+1") }),
         physicalEffect: false,
         witnessEffect: false,
         entities: false,
@@ -39,7 +39,7 @@ export const baseOvniFranceTestCases = [
         url: new URL("listgen.php?typlist=20&page=0&numobs=1655", baseOvniFranceDatasource.baseUrl).href,
         city: "Chambon sur Voueize",
         depCode: "23",
-        time: new TimeContext(1970, 3, 17, 19, 15, "GMT+1"),
+        time: new EdtfDate({ year: 1970, month: 3, day: 17, hour: 19, minute: 15, timeshift: Level2Timeshift.fromString("GMT+1") }),
         physicalEffect: false,
         witnessEffect: false,
         entities: false,

package/dist/time/datasource/fufora/FuforaCaseSummary.d.ts

@@ -1,10 +1,10 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export interface FuforaCaseSummary {
     readonly id: string;
     readonly url: string;
     readonly city: string;
     readonly sightingPlace: string | undefined;
-    readonly dateTime: TimeContext;
+    readonly dateTime: EdtfDate;
     readonly dateTimeRefinement?: string;
     readonly durationClock?: string;
     readonly durationEstimation?: string;

package/dist/time/datasource/fufora/FuforaCaseSummaryRR0Mapper.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 FUFORA cases to RR0 cases.
  */
@@ -15,18 +16,18 @@ export class FuforaCaseSummaryRR0Mapper {
         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: EdtfDate.fromDate(sourceTime) }
         };
         const cityName = sourceCase.city || sourceCase.sightingPlace;
         const city = this.cityService.find(context, cityName, undefined);
         assert.ok(city, `Could not find city "${cityName}" for case ${id} at ${sourceCase.dateTime}`);
-        const place = { name: city.getTitle(context), place: city.places[0] };
         return {
-            type: "sighting",
+            type: "event",
+            eventType: "sighting",
             events: [],
             id,
             time: sourceCase.dateTime,
-            place,
+            place: new OrganizationPlace(city),
             description: this.getDescription(sourceCase),
             sources: [source]
         };

package/dist/time/datasource/fufora/FuforaDatasource.test.js

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

package/dist/time/datasource/fufora/FuforaHttpDatasource.js

@@ -2,6 +2,7 @@ import { HttpSource } from "../HttpSource.js";
 import { UrlUtil } from "../../../util/index.js";
 import { JSDOM } from "jsdom";
 import { FuforaDatasource } from "./FuforaDatasource.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export class FuforaHttpDatasource extends FuforaDatasource {
     constructor(baseUrl, searchPath) {
         super();
@@ -54,12 +55,12 @@ export class FuforaHttpDatasource extends FuforaDatasource {
         const caseLink = fields[0].firstElementChild;
         const dateFormat = /(?:(\d\d).(\d\d).(\d\d\d\d))?\n?(.+)?/;
         const dateFields = dateFormat.exec(fields[1].textContent);
-        const itemContext = context.clone();
-        const dateTime = itemContext.time;
-        dateTime.setYear(parseInt(dateFields[3], 10));
-        dateTime.setMonth(parseInt(dateFields[2], 10));
         const dayOfMonth = dateFields[1];
-        dateTime.setDayOfMonth(dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined);
+        const dateTime = new EdtfDate({
+            year: parseInt(dateFields[3], 10),
+            month: parseInt(dateFields[2], 10),
+            day: dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined
+        });
         const dateTimeRefinement = dateFields[4] ? dateFields[4].trim() : undefined;
         const placeStr = fields[2].innerHTML;
         const placeRows = placeStr.split("<br>");

package/dist/time/datasource/fufora/FuforaRR0Mapping.d.ts

@@ -2,6 +2,12 @@ import { FuforaHttpDatasource } from "./FuforaHttpDatasource.js";
 import { FuforaCaseSummaryRR0Mapper } from "./FuforaCaseSummaryRR0Mapper.js";
 import { RR0CaseMapping } from "../rr0/RR0CaseMapping.js";
 import { FuforaCaseSummary } from "./FuforaCaseSummary.js";
+import { CityService } from "../../../org";
+import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
 export declare const fuforaDatasource: FuforaHttpDatasource;
-export declare const fuforaRR0Mapper: FuforaCaseSummaryRR0Mapper;
-export declare const fuforaRR0Mapping: RR0CaseMapping<FuforaCaseSummary>;
+export declare class FuforaRR0Mapping implements RR0CaseMapping<FuforaCaseSummary> {
+    readonly actions: ChronologyReplacerActions;
+    mapper: FuforaCaseSummaryRR0Mapper;
+    datasource: FuforaHttpDatasource;
+    constructor(cityService: CityService, actions: ChronologyReplacerActions);
+}

package/dist/time/datasource/fufora/FuforaRR0Mapping.js

@@ -1,11 +1,10 @@
 import { FuforaHttpDatasource } from "./FuforaHttpDatasource.js";
 import { FuforaCaseSummaryRR0Mapper } from "./FuforaCaseSummaryRR0Mapper.js";
-import { cityService } from "../../../org/Cities.js";
 export const fuforaDatasource = new FuforaHttpDatasource(new URL("https://www.fufora.fi"), "ufodb2/ufohaku.php");
-export const fuforaRR0Mapper = new FuforaCaseSummaryRR0Mapper(cityService, fuforaDatasource.baseUrl, fuforaDatasource.copyright, fuforaDatasource.authors);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const fuforaRR0Mapping = {
-    datasource: fuforaDatasource,
-    mapper: fuforaRR0Mapper,
-    actions
-};
+export class FuforaRR0Mapping {
+    constructor(cityService, actions) {
+        this.actions = actions;
+        this.datasource = fuforaDatasource;
+        this.mapper = new FuforaCaseSummaryRR0Mapper(cityService, fuforaDatasource.baseUrl, fuforaDatasource.copyright, fuforaDatasource.authors);
+    }
+}

package/dist/time/datasource/fufora/FuforaTestCases.js

@@ -1,4 +1,4 @@
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { fuforaDatasource } from "./FuforaRR0Mapping.js";
 export const fuforaTestCases = [
     {
@@ -6,7 +6,7 @@ export const fuforaTestCases = [
         url: new URL("ufodata.php?u=40&p=1&sid=", fuforaDatasource.baseUrl).href,
         sightingPlace: "Kotini kylänlahden VR:n talo, opiston lähellä",
         city: "Pielisjärvi",
-        dateTime: new TimeContext(1970, 11, 1),
+        dateTime: new EdtfDate({ year: 1970, month: 11, day: 1 }),
         dateTimeRefinement: "Oli talvi, pimeä vuodenaika arvio marraskuu, mielestäni1970",
         classification: "8LIV7Y3"
     },
@@ -15,7 +15,7 @@ export const fuforaTestCases = [
         url: new URL("ufodata.php?u=1818&p=1&sid=", fuforaDatasource.baseUrl).href,
         sightingPlace: "Märjälahden ranta",
         city: "Pielisjärvi Lieksa",
-        dateTime: new TimeContext(1970, 11, 1),
+        dateTime: new EdtfDate({ year: 1970, month: 11, day: 1 }),
         classification: "7VAP7Y3"
     }
 ];

package/dist/time/datasource/nuforc/NuforcCaseSummary.d.ts

@@ -1,10 +1,10 @@
 import { NuforcState } from "./NuforcState.js";
 import { NuforcCountry } from "./NuforcCountry.js";
 import { NuforcShape } from "./NuforcShape.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export interface NuforcCaseSummary {
     readonly id: string;
-    readonly time: TimeContext;
+    readonly time: EdtfDate;
     readonly url: string;
     readonly city: string;
     readonly state: NuforcState;