@rr0/cms 0.1.23 → 0.2.0

package/dist/time/datasource/nuforc/NuforcDatasource.test.js

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

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

@@ -2,7 +2,7 @@ import { RR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { NuforcCaseSummary } from "./NuforcCaseSummary.js";
 import { NuforcState } from "./NuforcState.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { NuforcCountry } from "./NuforcCountry.js";
 import { NuforcShape } from "./NuforcShape.js";
 import { NuforcDatasource } from "./NuforcDatasource.js";
@@ -17,7 +17,7 @@ export declare class NuforcHttpDatasource extends NuforcDatasource {
     protected getShape(shapeField: HTMLTableCellElement): NuforcShape;
     protected getCountry(countryField: HTMLTableCellElement): NuforcCountry;
     protected getState(caseField: HTMLTableCellElement): NuforcState;
-    protected getTime(dateField: HTMLTableCellElement, context: RR0Context): TimeContext;
+    protected getTime(dateField: HTMLTableCellElement, context: RR0Context): EdtfDate;
     protected getLink(caseField: HTMLTableCellElement): URL;
     protected dateFromField(reportField: HTMLTableCellElement): Date;
     protected getImage(imageField: HTMLTableCellElement): boolean;

package/dist/time/datasource/nuforc/NuforcHttpDatasource.js

@@ -3,6 +3,7 @@ import { UrlUtil } from "../../../util/index.js";
 import { ObjectUtil } from "../../../util/ObjectUtil.js";
 import { NuforcState } from "./NuforcState.js";
 import assert from "assert";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { NuforcCountry } from "./NuforcCountry.js";
 import { NuforcShape } from "./NuforcShape.js";
 import { NuforcDatasource } from "./NuforcDatasource.js";
@@ -46,17 +47,16 @@ export class NuforcHttpDatasource extends NuforcDatasource {
     }
     getTime(dateField, context) {
         const dateFields = NuforcHttpDatasource.dateFormat.exec(dateField.textContent);
-        const itemContext = context.clone();
-        const dateTime = itemContext.time;
-        dateTime.setYear(parseInt(dateFields[3], 10));
-        dateTime.setMonth(parseInt(dateFields[1], 10));
         const dayOfMonth = dateFields[2];
-        dateTime.setDayOfMonth(dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined);
         const hour = parseInt(dateFields[4], 10);
         const minutes = parseInt(dateFields[5], 10);
-        dateTime.setHour(hour);
-        dateTime.setMinutes(minutes);
-        return dateTime;
+        return new EdtfDate({
+            year: parseInt(dateFields[3], 10),
+            month: parseInt(dateFields[1], 10),
+            day: dayOfMonth !== "00" ? parseInt(dayOfMonth, 10) : undefined,
+            hour,
+            minute: minutes
+        });
     }
     getLink(caseField) {
         const caseLink = caseField.firstElementChild;

package/dist/time/datasource/nuforc/NuforcRR0Mapper.js

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { NuforcShape } from "./NuforcShape.js";
 import { australia } from "../../../org/au/Australia.js";
 import { brazil } from "../../../org/br/Brazil.js";
@@ -18,6 +18,7 @@ import { uk } from "../../../org/uk/Uk.js";
 import { usa } from "../../../org/us/Usa.js";
 import { algeria } from "../../../org/dz/Algeria.js";
 import { panama } from "../../../org/pa/Panama.js";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 export class NuforcRR0Mapper {
     constructor(cityService, countryService, baseUrl, copyright, authors) {
         this.cityService = cityService;
@@ -61,7 +62,7 @@ export class NuforcRR0Mapper {
             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) }
         };
         assert.ok(sourceCase.country, `NUFORC country code is ${sourceCase.country}`);
         const countryCode = NuforcRR0Mapper.countryMap[sourceCase.country];
@@ -72,12 +73,12 @@ export class NuforcRR0Mapper {
         const placeName = placeItems[1];
         const city = this.cityService.find(context, placeName, undefined);
         assert.ok(city, `Could not find city of name "${placeName}" in state "${sourceCase.state}" of country "${countryCode}"`);
-        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/nuforc/NuforcRR0Mapper.test.js

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
-import { TimeContext } from "@rr0/time";
-import { nuforcDatasource, nuforcRR0Mapper } from "./NuforcRR0Mapping.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { nuforcDatasource } from "./NuforcRR0Mapping.js";
 import { nuforcTestCases } from "./NuforcTestCases.js";
 import { castlegar } from "../../../org/ca/region/bc/rdck/Castlegar/Castlegar.js";
 import { fortWorth } from "../../../org/us/region/tx/tarrant/fortworth/FortWorth.js";
@@ -10,12 +10,14 @@ import { stPetersburg } from "../../../org/us/region/fl/pinellas/stpetersburg/St
 import { monessen } from "../../../org/us/region/pa/westmoreland/monessen/Monessen.js";
 import { bonneyLake } from "../../../org/us/region/wa/pierce/bonneylake/BonneyLake.js";
 import { slocomb } from "../../../org/us/region/al/geneva/slocomb/Slocomb.js";
+import { NuforcRR0Mapper } from "./NuforcRR0Mapper";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
 function expectedSource(datasource, dataDate, caseNumber) {
     const url = new URL("sighting/?id=" + 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("NuforcRR0Mapper", () => {
@@ -30,6 +32,7 @@ describe("NuforcRR0Mapper", () => {
         expect(items).toEqual(nuforcTestCases);
     });
     test("fetch and map as RR0 cases", async () => {
+        const nuforcRR0Mapper = new NuforcRR0Mapper(rr0TestUtil.cityService, rr0TestUtil.countryService, nuforcDatasource.baseUrl.href, nuforcDatasource.copyright, nuforcDatasource.authors);
         const dataDate = new Date("2024-08-12 00:00:00 GMT+1");
         const testCases = nuforcTestCases.sort((c1, c2) => c1.id < c2.id ? -1 : c1.id > c2.id ? 1 : 0);
         const mapped = testCases.map(sourceCase => nuforcRR0Mapper.map(context, sourceCase, dataDate));
@@ -49,58 +52,65 @@ describe("NuforcRR0Mapper", () => {
         const nativeCase7Time = nativeCase7.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: slocomb.getMessages(context).title, place: slocomb.places[0] },
+                time: nativeCase1Time,
+                place: new OrganizationPlace(slocomb),
                 description: nuforcRR0Mapper.getDescription(nativeCase1),
                 sources: [expectedSource(nuforcDatasource, 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: castlegar.getMessages(context).title, place: castlegar.places[0] },
+                time: nativeCase2Time,
+                place: new OrganizationPlace(castlegar),
                 description: nuforcRR0Mapper.getDescription(nativeCase2),
                 sources: [expectedSource(nuforcDatasource, 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: fortWorth.getMessages(context).title, place: fortWorth.places[0] },
+                time: nativeCase3Time,
+                place: new OrganizationPlace(fortWorth),
                 description: nuforcRR0Mapper.getDescription(nativeCase3),
                 sources: [expectedSource(nuforcDatasource, 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: campPendleton.getMessages(context).title, place: campPendleton.places[0] },
+                time: nativeCase4Time,
+                place: new OrganizationPlace(campPendleton),
                 description: nuforcRR0Mapper.getDescription(nativeCase4),
                 sources: [expectedSource(nuforcDatasource, dataDate, nativeCase4.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase5Time.getYear(), nativeCase5Time.getMonth(), nativeCase5Time.getDayOfMonth(), nativeCase5Time.getHour(), nativeCase5Time.getMinutes(), nativeCase5Time.getTimeZone()),
-                place: { name: stPetersburg.getMessages(context).title, place: stPetersburg.places[0] },
+                time: nativeCase5Time,
+                place: new OrganizationPlace(stPetersburg),
                 description: nuforcRR0Mapper.getDescription(nativeCase5),
                 sources: [expectedSource(nuforcDatasource, dataDate, nativeCase5.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase6Time.getYear(), nativeCase6Time.getMonth(), nativeCase6Time.getDayOfMonth(), nativeCase6Time.getHour(), nativeCase6Time.getMinutes(), nativeCase6Time.getTimeZone()),
-                place: { name: monessen.getMessages(context).title, place: monessen.places[0] },
+                time: nativeCase6Time,
+                place: new OrganizationPlace(monessen),
                 description: nuforcRR0Mapper.getDescription(nativeCase6),
                 sources: [expectedSource(nuforcDatasource, dataDate, nativeCase6.id)]
             },
             {
-                type: "sighting",
+                type: "event",
+                eventType: "sighting",
                 events: [],
-                time: new TimeContext(nativeCase7Time.getYear(), nativeCase7Time.getMonth(), nativeCase7Time.getDayOfMonth(), nativeCase7Time.getHour(), nativeCase7Time.getMinutes(), nativeCase7Time.getTimeZone()),
-                place: { name: bonneyLake.getMessages(context).title, place: bonneyLake.places[0] },
+                time: nativeCase7Time,
+                place: new OrganizationPlace(bonneyLake),
                 description: nuforcRR0Mapper.getDescription(nativeCase7),
                 sources: [expectedSource(nuforcDatasource, dataDate, nativeCase7.id)]
             }

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

@@ -1,10 +1,13 @@
 import { NuforcRR0Mapper } from "./NuforcRR0Mapper.js";
 import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
-import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
+import { CityService, CountryService } from "../../../org";
+import { RR0CaseMapping } from "../rr0";
+import { ChronologyReplacerActions } from "../ChronologyReplacerActions";
+import { NuforcCaseSummary } from "./NuforcCaseSummary";
 export declare const nuforcDatasource: NuforcHttpDatasource;
-export declare const nuforcRR0Mapper: NuforcRR0Mapper;
-export declare const nuforcRR0Mapping: {
+export declare class NuforcRR0Mapping implements RR0CaseMapping<NuforcCaseSummary> {
+    readonly actions: ChronologyReplacerActions;
     datasource: NuforcHttpDatasource;
     mapper: NuforcRR0Mapper;
-    actions: ChronologyReplacerActions;
-};
+    constructor(cityService: CityService, countryService: CountryService, actions: ChronologyReplacerActions);
+}

package/dist/time/datasource/nuforc/NuforcRR0Mapping.js

@@ -1,8 +1,10 @@
 import { NuforcRR0Mapper } from "./NuforcRR0Mapper.js";
 import { NuforcHttpDatasource } from "./NuforcHttpDatasource.js";
-import { cityService } from "../../../org/Cities.js";
-import { countryService } from "../../../org/country/CountryService.js";
 export const nuforcDatasource = new NuforcHttpDatasource();
-export const nuforcRR0Mapper = new NuforcRR0Mapper(cityService, countryService, nuforcDatasource.baseUrl.href, nuforcDatasource.copyright, nuforcDatasource.authors);
-const actions = { read: ["fetch"], write: ["backup"] };
-export const nuforcRR0Mapping = { datasource: nuforcDatasource, mapper: nuforcRR0Mapper, actions };
+export class NuforcRR0Mapping {
+    constructor(cityService, countryService, actions) {
+        this.actions = actions;
+        this.datasource = nuforcDatasource;
+        this.mapper = new NuforcRR0Mapper(cityService, countryService, nuforcDatasource.baseUrl.href, nuforcDatasource.copyright, nuforcDatasource.authors);
+    }
+}

package/dist/time/datasource/nuforc/NuforcTestCases.js

@@ -1,5 +1,5 @@
 import { nuforcDatasource } from "./NuforcRR0Mapping.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { NuforcState } from "./NuforcState.js";
 import { NuforcCountry } from "./NuforcCountry.js";
 import { NuforcShape } from "./NuforcShape.js";
@@ -10,7 +10,7 @@ export const nuforcTestCases = [
         city: "Slocomb",
         state: NuforcState.Alabama,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 30, 21, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 30, hour: 21, minute: 0 }),
         shape: NuforcShape.Circle,
         summary: "craft just above the trees moving slowly, silent,circular solid white light. witnessed by 5 of us",
         reportDate: new Date("12/21/2003"),
@@ -23,7 +23,7 @@ export const nuforcTestCases = [
         city: "Camp Pendleton",
         state: NuforcState.California,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 21, 20, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 21, hour: 20, minute: 0 }),
         shape: NuforcShape.Disk,
         summary: "While using night vison scopes , 28 Marines witness 3 saucer craft hovering near Camp Pendleton rifle range during night firing exersi",
         reportDate: new Date("07/01/2005"),
@@ -36,7 +36,7 @@ export const nuforcTestCases = [
         city: "Fort Worth",
         state: NuforcState.Texas,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 20, 16, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 20, hour: 16, minute: 0 }),
         shape: NuforcShape.Disk,
         summary: "Scintillating silvery, metallic object, probably disk-shaped, apparently changing attitude",
         reportDate: new Date("03/28/2004"),
@@ -49,7 +49,7 @@ export const nuforcTestCases = [
         city: "Castlegar (Canada)",
         state: NuforcState.BritishColumbia,
         country: NuforcCountry.Canada,
-        time: new TimeContext(1970, 3, 15, 22, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 15, hour: 22, minute: 0 }),
         shape: NuforcShape.Light,
         summary: "HBCCUFO CANADIAN REPORT:  At least seven, emerged from the light and were flying around the still stationary larger object.",
         reportDate: new Date("03/09/2004"),
@@ -62,7 +62,7 @@ export const nuforcTestCases = [
         city: "Monessen",
         state: NuforcState.Pennsylvania,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 12, 3, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 12, hour: 3, minute: 0 }),
         shape: NuforcShape.Cylinder,
         summary: "Probe Flourescent Bulb Sized Object.",
         reportDate: new Date("04/10/2013"),
@@ -75,7 +75,7 @@ export const nuforcTestCases = [
         city: "St. Petersburg",
         state: NuforcState.Florida,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 10, 0, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 10, hour: 0, minute: 0 }),
         shape: NuforcShape.Disk,
         summary: "Encounter with disked shape UFO on campus of Florida Presbyterian College with 30 others",
         reportDate: new Date("02/01/2008"),
@@ -88,7 +88,7 @@ export const nuforcTestCases = [
         city: "Bonney lake",
         state: NuforcState.Washington,
         country: NuforcCountry.USA,
-        time: new TimeContext(1970, 3, 7, 9, 0),
+        time: new EdtfDate({ year: 1970, month: 3, day: 7, hour: 9, minute: 0 }),
         shape: NuforcShape.Circle,
         summary: "2 ufos 20ft and 5ft",
         reportDate: new Date("09/02/2022"),

package/dist/time/datasource/rr0/RR0CaseSummary.d.ts

@@ -1,29 +1,4 @@
-import { RR0Data, RR0Event } from "@rr0/data";
+import { RR0Event } from "@rr0/data";
 export interface RR0CaseSummary extends RR0Event {
-    /**
-     * A unique identifier for this data.
-     * // TODO: Make it mandatory
-     */
-    id?: string;
-    /**
-     * The directory where the data is stored, relatively to RR0's root.
-     * Should end with a trailing slash ("/").
-     */
-    dirName?: string;
-    /**
-     * Public URL of the data (not the RR0 URL)
-     */
-    url?: string;
-    /**
-     * Events of the data.
-     */
-    events: RR0Event[];
-    /**
-     * The data type ("people", "place", "org", "book", "case", "sighting"...)
-     */
-    readonly type: "sighting";
-    /**
-     * Parent data.
-     */
-    parent?: RR0Data;
+    readonly eventType: "sighting";
 }

package/dist/time/datasource/rr0/RR0CaseSummaryJson.d.ts

@@ -0,0 +1,26 @@
+import { RR0EventJson } from "@rr0/data";
+export interface RR0CaseSummaryJson extends RR0EventJson {
+    /**
+     * A unique identifier for this data.
+     * // TODO: Make it mandatory
+     */
+    id?: string;
+    /**
+     * The directory where the data is stored, relatively to RR0's root.
+     * Should end with a trailing slash ("/").
+     */
+    dirName?: string;
+    /**
+     * Public URL of the data (not the RR0 URL)
+     */
+    url?: string;
+    /**
+     * Events of the data.
+     */
+    events: RR0EventJson[];
+    readonly eventType: "sighting";
+    /**
+     * Parent data id
+     */
+    parent?: string;
+}

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

@@ -0,0 +1 @@
+export {};

package/dist/time/datasource/rr0/RR0Datasource.test.d.ts

@@ -5,6 +5,8 @@ import { RR0Datasource } from "./RR0Datasource.js";
 import { Datasource } from "../Datasource.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
+import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
+import { RR0FileDatasource } from "./RR0FileDatasource";
 export declare class RR0TestDatasource extends RR0Datasource implements Datasource<RR0CaseSummary> {
     timeTextBuilder: TimeTextBuilder;
     constructor();
@@ -13,7 +15,7 @@ export declare class RR0TestDatasource extends RR0Datasource implements Datasour
 export declare class RR0TestMapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
     readonly datasource: RR0TestDatasource;
-    readonly backupDatasource: import("./RR0FileDatasource.js").RR0FileDatasource;
-    readonly mapper: import("./RR0CaseSummaryMapper.js").RR0CaseSummaryMapper;
+    readonly backupDatasource: RR0FileDatasource;
+    readonly mapper: RR0CaseSummaryMapper;
     constructor(actions: ChronologyReplacerActions);
 }

package/dist/time/datasource/rr0/RR0Datasource.test.js

@@ -2,10 +2,11 @@ import { beforeEach, describe, test } from "@javarome/testscript";
 import { rr0TestUtil } from "../../../test/index.js";
 import { rr0TestCases } from "./RR0TestCases.js";
 import { DatasourceTestCase } from "../DatasourceTestCase.js";
-import { rr0FileDatasource, rr0Mapper } from "./RR0Mapping.js";
 import { HtmlTag } from "../../../util/html/HtmlTag.js";
 import { RR0Datasource } from "./RR0Datasource.js";
 import { TimeTextBuilder } from "../../text/TimeTextBuilder.js";
+import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper";
+import { RR0FileDatasource } from "./RR0FileDatasource";
 export class RR0TestDatasource extends RR0Datasource {
     constructor() {
         super();
@@ -19,8 +20,8 @@ export class RR0TestMapping {
     constructor(actions) {
         this.actions = actions;
         this.datasource = new RR0TestDatasource();
-        this.backupDatasource = rr0FileDatasource;
-        this.mapper = rr0Mapper;
+        this.mapper = new RR0CaseSummaryMapper(new URL("https://rr0.org"), "time", ["Beau, Jérôme"]);
+        this.backupDatasource = new RR0FileDatasource(this.mapper);
     }
 }
 describe("RR0CaseSource", () => {
@@ -54,7 +55,7 @@ describe("RR0CaseSource", () => {
                     }
                     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/rr0/RR0HttpDatasource.d.ts

@@ -1,24 +1,24 @@
 import { HtmlRR0Context } from "../../../RR0Context.js";
 import { HttpSource } from "../HttpSource.js";
 import { RR0Datasource } from "./RR0Datasource.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { CityService } from "../../../org/index.js";
-import { NamedPlace } from "./NamedPlace";
 import { Source } from "@rr0/data/dist/source";
+import { Place } from "@rr0/place";
 export declare class RR0HttpDatasource extends RR0Datasource {
     readonly baseUrl: URL;
     readonly searchPath: string;
     protected cityService: CityService;
     http: HttpSource;
     constructor(baseUrl: URL, searchPath: string, cityService: CityService);
-    id(dateTime: TimeContext, place: NamedPlace | undefined): string;
+    static id(dateTime: EdtfDate, place: Place | undefined): string;
     getFromRows(context: HtmlRR0Context, rows: Element[]): RR0CaseSummary[];
     findRows(doc: HTMLElement): Element[];
     getFromRow(context: HtmlRR0Context, r: Element): RR0CaseSummary;
     protected readCases(context: HtmlRR0Context): Promise<RR0CaseSummary[]>;
     protected getSources(row: Element, itemContext: HtmlRR0Context): Source[];
-    protected getPlace(context: HtmlRR0Context, placeEl: Element): NamedPlace;
+    protected getPlace(context: HtmlRR0Context, placeEl: Element): Place;
     protected getDescription(el: Element): string;
     protected queryUrl(context: HtmlRR0Context): URL;
 }

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

@@ -1,8 +1,9 @@
 import { HttpSource } from "../HttpSource.js";
 import { UrlUtil } from "../../../util/index.js";
 import { RR0Datasource } from "./RR0Datasource.js";
-import { TimeContext } from "@rr0/time";
-import { Place } from "../../../place/index.js";
+import { Level2Date as EdtfDate } from "@rr0/time";
+import { OrganizationPlace } from "../../../place/OrganizationPlace";
+import { NamedPlace } from "../../../place/NamedPlace";
 export class RR0HttpDatasource extends RR0Datasource {
     constructor(baseUrl, searchPath, cityService) {
         super();
@@ -11,9 +12,9 @@ export class RR0HttpDatasource extends RR0Datasource {
         this.cityService = cityService;
         this.http = new HttpSource();
     }
-    id(dateTime, place) {
+    static id(dateTime, place) {
         var _a;
-        return dateTime.toString() + ((place === null || place === void 0 ? void 0 : place.org) ? "$" + ((_a = place.org) === null || _a === void 0 ? void 0 : _a.dirName.replaceAll("/", "_")) : "");
+        return dateTime.toString() + (place instanceof OrganizationPlace ? "$" + ((_a = place.org) === null || _a === void 0 ? void 0 : _a.dirName.replaceAll("/", "_")) : "");
     }
     getFromRows(context, rows) {
         const cases = [];
@@ -53,8 +54,8 @@ export class RR0HttpDatasource extends RR0Datasource {
         }
         const sources = this.getSources(row, itemContext);
         const description = this.getDescription(row);
-        const id = this.id(itemTime, place);
-        return { type: "sighting", events: [], url: url.href, place, time: itemTime, description, sources, id };
+        const id = RR0HttpDatasource.id(itemTime.date, place);
+        return { type: "event", eventType: "sighting", events: [], url: url.href, place, time: itemTime.date, description, sources, id };
     }
     async readCases(context) {
         const queryUrl = this.queryUrl(context);
@@ -76,7 +77,7 @@ export class RR0HttpDatasource extends RR0Datasource {
             const pubItems = title.split(",");
             const timeStr = pubItems[pubItems.length - 1].trim();
             let publisher;
-            const time = TimeContext.fromString(timeStr);
+            const time = EdtfDate.fromString(timeStr);
             if (time) {
                 pubItems.pop();
             }
@@ -91,26 +92,19 @@ export class RR0HttpDatasource extends RR0Datasource {
     getPlace(context, placeEl) {
         const placeStr = placeEl.textContent;
         const placeParsed = RR0HttpDatasource.placeRegex.exec(placeStr);
-        let name;
-        let place;
         let org;
+        placeEl.remove();
         if (placeParsed) {
             const parent = undefined; // TODO: Find region from placeParsed[2]
             org = this.cityService.find(context, placeParsed[1], parent);
             if (org) {
-                name = org.getMessages(context).toTitle(context, org, { parent: true });
-                place = org.places[0];
+                return new OrganizationPlace(org);
             }
             else {
                 context.debug(`Could not find place named "${placeParsed[1]}"`);
             }
         }
-        if (!org) {
-            name = placeStr;
-            place = new Place([]);
-        }
-        placeEl.remove();
-        return { name, org, place };
+        return new NamedPlace(placeStr);
     }
     getDescription(el) {
         const notes = el.querySelectorAll(".note-id");

package/dist/time/datasource/rr0/RR0Mapping.d.ts

@@ -1,16 +1,16 @@
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper.js";
-import { RR0HttpDatasource } from "./RR0HttpDatasource.js";
 import { ChronologyReplacerActions } from "../ChronologyReplacerActions.js";
 import { RR0CaseMapping } from "./RR0CaseMapping.js";
 import { RR0CaseSummary } from "./RR0CaseSummary.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
-export declare const rr0HttpDatasource: RR0HttpDatasource;
-export declare const rr0FileDatasource: RR0FileDatasource;
-export declare const rr0Mapper: RR0CaseSummaryMapper;
+import { CityService } from "../../../org";
+import { RR0Datasource } from "./RR0Datasource";
 export declare class RR0Mapping implements RR0CaseMapping<RR0CaseSummary> {
     readonly actions: ChronologyReplacerActions;
-    readonly datasource: RR0HttpDatasource;
+    readonly datasource: RR0Datasource;
+    readonly fileDatasource: RR0FileDatasource;
     readonly mapper: RR0CaseSummaryMapper;
-    readonly backupDatasource: RR0FileDatasource;
-    constructor(actions: ChronologyReplacerActions, datasource?: RR0HttpDatasource, mapper?: RR0CaseSummaryMapper, backupDatasource?: RR0FileDatasource);
+    static baseUrl: URL;
+    static searchPath: string;
+    constructor(cityService: CityService, actions: ChronologyReplacerActions);
 }

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

@@ -1,16 +1,13 @@
 import { RR0CaseSummaryMapper } from "./RR0CaseSummaryMapper.js";
 import { RR0HttpDatasource } from "./RR0HttpDatasource.js";
-import { cityService } from "../../../org/index.js";
 import { RR0FileDatasource } from "./RR0FileDatasource.js";
-export const rr0HttpDatasource = new RR0HttpDatasource(new URL("https://rr0.org"), "time", cityService);
-const csvMapper = new RR0CaseSummaryMapper(rr0HttpDatasource.baseUrl, rr0HttpDatasource.searchPath, rr0HttpDatasource.authors);
-export const rr0FileDatasource = new RR0FileDatasource(csvMapper);
-export const rr0Mapper = new RR0CaseSummaryMapper(rr0HttpDatasource.baseUrl, rr0HttpDatasource.copyright, rr0HttpDatasource.authors);
 export class RR0Mapping {
-    constructor(actions, datasource = rr0HttpDatasource, mapper = rr0Mapper, backupDatasource = rr0FileDatasource) {
+    constructor(cityService, actions) {
         this.actions = actions;
-        this.datasource = datasource;
-        this.mapper = mapper;
-        this.backupDatasource = backupDatasource;
+        const rr0HttpDatasource = this.datasource = new RR0HttpDatasource(RR0Mapping.baseUrl, RR0Mapping.searchPath, cityService);
+        const csvMapper = this.mapper = new RR0CaseSummaryMapper(rr0HttpDatasource.baseUrl, rr0HttpDatasource.searchPath, rr0HttpDatasource.authors);
+        this.fileDatasource = new RR0FileDatasource(csvMapper);
     }
 }
+RR0Mapping.baseUrl = new URL("https://rr0.org");
+RR0Mapping.searchPath = "time";