@rr0/cms 0.1.24 → 0.2.0

package/dist/people/PeopleService.js

@@ -56,18 +56,13 @@ export class PeopleService extends AbstractDataService {
         return peopleList;
     }
     async getFromDir(dirName) {
-        let peopleList = [];
         const fileSpec = ["people*.json"];
-        const peopleDataList = await this.dataService.getFromDir(dirName, ["people", undefined], fileSpec);
-        for (const peopleData of peopleDataList) {
-            const people = this.factory.createFromData(peopleData);
-            peopleList.push(people);
-        }
-        return peopleList;
+        return this.dataService.getFromDir(dirName, ["people", undefined], fileSpec);
     }
     getLink(context, people, pseudoPeopleList, allCountries, occupations, filterOccupations = [], content) {
-        var _a;
+        var _a, _b, _c;
         const dirName = people.dirName;
+        const events = people.events;
         const titles = [];
         const classList = ["data-resolved", "people-resolved"];
         if (pseudoPeopleList.indexOf(people) >= 0 || people.pseudonyms.includes(content)) {
@@ -77,21 +72,13 @@ export class PeopleService extends AbstractDataService {
         if (people.hoax) {
             classList.push("canular");
         }
-        let birthTimeStr = people.birthTime;
-        if (birthTimeStr) {
-            const birthTime = people.birthTime = this.timeService.dateFromIso(birthTimeStr);
-            birthTimeStr = birthTime.getFullYear().toString();
-        }
-        let deathTimeStr = people.deathTime;
-        if (deathTimeStr) {
-            const deathTime = people.deathTime = this.timeService.dateFromIso(deathTimeStr);
-            deathTimeStr = deathTime.getFullYear().toString();
-        }
+        const birthTimeStr = (_a = people.birthTime) === null || _a === void 0 ? void 0 : _a.year.toString();
+        const deathTimeStr = (_b = people.deathTime) === null || _b === void 0 ? void 0 : _b.year.toString();
         if (people.isDeceased()) {
             classList.push("deceased");
         }
         if (birthTimeStr || deathTimeStr) {
-            const timeStr = birthTimeStr ? deathTimeStr ? birthTimeStr + "-" + deathTimeStr : birthTimeStr + "-" : "-" + deathTimeStr;
+            const timeStr = birthTimeStr ? deathTimeStr ? `${birthTimeStr}-${deathTimeStr}` : `${birthTimeStr}-` : `-${deathTimeStr}`;
             titles.push(timeStr);
         }
         const age = people.getAge();
@@ -102,7 +89,7 @@ export class PeopleService extends AbstractDataService {
         if (countries) {
             for (const country of countries) {
                 allCountries.add(country);
-                const countryLabel = (_a = context.messages.country[country]) === null || _a === void 0 ? void 0 : _a.title;
+                const countryLabel = (_c = context.messages.country[country]) === null || _c === void 0 ? void 0 : _c.title;
                 if (!countryLabel) {
                     throw new Error(`No title for country "${country}"`);
                 }
@@ -139,8 +126,9 @@ export class PeopleService extends AbstractDataService {
             elem.classList.add(...classList);
         }
         let portraitUrl = people.image;
+        const imageEvents = events.filter(event => event.eventType === "image");
         if (!portraitUrl) {
-            const portraitEvent = people.events.find(event => event.type === "image" && AbstractDataFactory.defaultImageFileNames.includes(event.url));
+            const portraitEvent = imageEvents.find(event => AbstractDataFactory.defaultImageFileNames.includes(event.url));
             if (portraitEvent) {
                 portraitUrl = path.join("/", people.dirName, portraitEvent.url);
             }

package/dist/place/NamedPlace.d.ts

@@ -0,0 +1,5 @@
+import { Place } from "@rr0/place";
+export declare class NamedPlace extends Place {
+    readonly name: string;
+    constructor(name: string);
+}

package/dist/place/NamedPlace.js

@@ -0,0 +1,7 @@
+import { Place } from "@rr0/place";
+export class NamedPlace extends Place {
+    constructor(name) {
+        super([]);
+        this.name = name;
+    }
+}

package/dist/place/OrganizationPlace.d.ts

@@ -0,0 +1,6 @@
+import { Organization } from "../org";
+import { Place } from "@rr0/place";
+export declare class OrganizationPlace extends Place {
+    readonly org: Organization;
+    constructor(org: Organization);
+}

package/dist/place/OrganizationPlace.js

@@ -0,0 +1,8 @@
+import { Place } from "@rr0/place";
+export class OrganizationPlace extends Place {
+    constructor(org) {
+        super(org.places[0].locations, org.places[0].elevation, org.places[0].dirName);
+        this.org = org;
+        Object.assign(this, org.places[0]);
+    }
+}

package/dist/place/PlaceRenderer.d.ts

@@ -0,0 +1,8 @@
+import { Place } from "@rr0/place";
+import { HtmlRR0Context } from "../RR0Context";
+/**
+ * Convert a place to a <span class="place"> tag with the place name (or location)
+ */
+export declare class PlaceRenderer {
+    render(context: HtmlRR0Context, place: Place): string;
+}

package/dist/place/PlaceRenderer.js

@@ -0,0 +1,17 @@
+import { OrganizationPlace } from "./OrganizationPlace";
+/**
+ * Convert a place to a <span class="place"> tag with the place name (or location)
+ */
+export class PlaceRenderer {
+    render(context, place) {
+        let placeName;
+        if (place instanceof OrganizationPlace) {
+            const orgPlace = place;
+            placeName = orgPlace.org.getTitle(context, { parent: true });
+        }
+        else {
+            placeName = place.locations.map(location => location.toDMS(context.place)).join(",");
+        }
+        return placeName;
+    }
+}

package/dist/place/PlaceReplacer.d.ts

@@ -1,4 +1,7 @@
 import { HtmlSsgContext } from "ssg-api";
+/**
+ * Replaces an existing <span class="place"> tag with clickable map trigger element.
+ */
 export declare class PlaceReplacer {
     replacement(context: HtmlSsgContext, original: HTMLElement): Promise<HTMLElement>;
 }

package/dist/place/PlaceReplacer.js

@@ -1,3 +1,6 @@
+/**
+ * Replaces an existing <span class="place"> tag with clickable map trigger element.
+ */
 export class PlaceReplacer {
     async replacement(context, original) {
         let replacement;

package/dist/place/PlaceReplacer.test.js

@@ -1,12 +1,10 @@
 import { PlaceReplacer } from "./PlaceReplacer.js";
-import { PlaceService } from "./PlaceService.js";
-import { Place } from "./Place.js";
 import { OrganizationService } from "../org/OrganizationService.js";
 import { rr0TestUtil } from "../test/index.js";
 import { describe, expect, test } from "@javarome/testscript";
-import { OrganizationKind } from "../org/Organization.js";
 import { OrganizationMessages } from "../org/index.js";
-import { PlaceLocation } from "@rr0/place";
+import { Place, PlaceLocation, PlaceService } from "@rr0/place";
+import { OrganizationKind } from "../org/OrganizationKind";
 class MockPlaceService extends PlaceService {
     constructor(location, elevation, dirName) {
         super("place");
@@ -26,7 +24,7 @@ class MockPlaceService extends PlaceService {
 }
 class MockOrganizationService extends OrganizationService {
     constructor(dirName) {
-        super([], "org", null);
+        super([], "org", rr0TestUtil.orgFactory, null);
         this.dirName = dirName;
     }
     async read(_fileName) {

package/dist/place/PlaceService.d.ts

@@ -1,5 +1,4 @@
-import { Elevation, Place } from "./Place.js";
-import { PlaceLocation } from "@rr0/place";
+import { Elevation, Place, PlaceLocation } from "@rr0/place";
 export declare abstract class PlaceService {
     readonly rootDir: string;
     protected readonly cache: Map<string, Place>;

package/dist/place/PlaceService.js

@@ -1,6 +1,5 @@
-import { Place } from "./Place.js";
 import fs from "fs";
-import { PlaceLocation } from "@rr0/place";
+import { Place, PlaceLocation } from "@rr0/place";
 import { writeFile } from "@javarome/fileutil";
 export class PlaceService {
     constructor(rootDir) {

package/dist/place/PlaceService.test.js

@@ -1,6 +1,5 @@
-import { GooglePlaceService } from "./GooglePlaceService.js";
 import { beforeEach, describe, expect, test } from "@javarome/testscript";
-import { PlaceLocation } from "@rr0/place";
+import { PlaceLocation, GooglePlaceService } from "@rr0/place";
 describe("PlaceService", () => {
     const apiKey = process.env.GOOGLE_MAPS_API_KEY;
     if (!apiKey) {

package/dist/place/index.d.ts

@@ -1,5 +1,2 @@
-export * from "./GooglePlaceService.js";
-export * from "./Place.js";
 export * from "./PlaceReplacer.js";
 export * from "./PlaceReplacerFactory.js";
-export * from "./PlaceService.js";

package/dist/place/index.js

@@ -1,5 +1,2 @@
-export * from "./GooglePlaceService.js";
-export * from "./Place.js";
 export * from "./PlaceReplacer.js";
 export * from "./PlaceReplacerFactory.js";
-export * from "./PlaceService.js";

package/dist/science/crypto/ufo/enquete/dossier/CaseConclusion.d.ts

@@ -0,0 +1,5 @@
+export declare enum CaseConclusion {
+    unknown = "unknown",
+    misinterpretation = "misinterpretation",
+    hoax = "hoax"
+}

package/dist/science/crypto/ufo/enquete/dossier/CaseConclusion.js

@@ -0,0 +1,6 @@
+export var CaseConclusion;
+(function (CaseConclusion) {
+    CaseConclusion["unknown"] = "unknown";
+    CaseConclusion["misinterpretation"] = "misinterpretation";
+    CaseConclusion["hoax"] = "hoax";
+})(CaseConclusion || (CaseConclusion = {}));

package/dist/science/crypto/ufo/enquete/dossier/CaseFactory.d.ts

@@ -1,5 +1,6 @@
 import { RR0Case } from "./RR0Case.js";
 import { RR0EventFactory, TypedDataFactory } from "@rr0/data";
-export declare class CaseFactory extends TypedDataFactory<RR0Case> {
+import { RR0CaseJson } from "./RR0CaseJson.js";
+export declare class CaseFactory extends TypedDataFactory<RR0Case, RR0CaseJson> {
     constructor(eventFactory: RR0EventFactory);
 }

package/dist/science/crypto/ufo/enquete/dossier/CaseService.d.ts

@@ -3,7 +3,8 @@ import { HtmlRR0Context } from "../../../../../RR0Context.js";
 import { TimeElementFactory } from "../../../../../time/index.js";
 import { CaseFactory } from "./CaseFactory.js";
 import { AbstractDataService, AllDataService } from "@rr0/data";
-export declare class CaseService extends AbstractDataService<RR0Case> {
+import { RR0CaseJson } from "./RR0CaseJson.js";
+export declare class CaseService extends AbstractDataService<RR0Case, RR0CaseJson> {
     protected readonly timeElementFactory: TimeElementFactory;
     constructor(dataService: AllDataService, factory: CaseFactory, timeElementFactory: TimeElementFactory, files: string[]);
     getLink(context: HtmlRR0Context, aCase: RR0Case): HTMLElement;

package/dist/science/crypto/ufo/enquete/dossier/CaseService.js

@@ -1,11 +1,13 @@
 import path from "path";
 import { AbstractDataService } from "@rr0/data";
+import { TimeContext } from "@rr0/time";
 export class CaseService extends AbstractDataService {
     constructor(dataService, factory, timeElementFactory, files) {
         super(dataService, factory, files);
         this.timeElementFactory = timeElementFactory;
     }
     getLink(context, aCase) {
+        var _a, _b, _c, _d, _e, _f;
         const details = [];
         const classList = ["data-resolved"];
         const classification = aCase.classification;
@@ -17,7 +19,7 @@ export class CaseService extends AbstractDataService {
         const time = aCase.time;
         const caseContext = context.clone();
         if (time) {
-            caseContext.time = time;
+            caseContext.time = new TimeContext((_a = time.year) === null || _a === void 0 ? void 0 : _a.value, (_b = time.month) === null || _b === void 0 ? void 0 : _b.value, (_c = time.day) === null || _c === void 0 ? void 0 : _c.value, (_d = time.hour) === null || _d === void 0 ? void 0 : _d.value, (_e = time.minute) === null || _e === void 0 ? void 0 : _e.value, (_f = time.timeshift) === null || _f === void 0 ? void 0 : _f.toString());
             const options = { year: "numeric" };
             const { result, replacement } = this.timeElementFactory.renderer.renderContent(caseContext, undefined, { url: true }, options);
             result.append(replacement);

package/dist/science/crypto/ufo/enquete/dossier/HynekClassification.d.ts

@@ -0,0 +1,10 @@
+export declare enum HynekClassification {
+    NL = "NL",
+    DD = "DD",
+    RV = "RV",
+    CE1 = "CE1",
+    CE2 = "CE2",
+    CE3 = "CE3",
+    CE4 = "CE3",
+    CE5 = "CE3"
+}

package/dist/science/crypto/ufo/enquete/dossier/HynekClassification.js

@@ -0,0 +1,11 @@
+export var HynekClassification;
+(function (HynekClassification) {
+    HynekClassification["NL"] = "NL";
+    HynekClassification["DD"] = "DD";
+    HynekClassification["RV"] = "RV";
+    HynekClassification["CE1"] = "CE1";
+    HynekClassification["CE2"] = "CE2";
+    HynekClassification["CE3"] = "CE3";
+    HynekClassification["CE4"] = "CE3";
+    HynekClassification["CE5"] = "CE3";
+})(HynekClassification || (HynekClassification = {}));

package/dist/science/crypto/ufo/enquete/dossier/RR0CaseJson.d.ts

@@ -0,0 +1,9 @@
+import { RR0CaseSummaryJson } from "../../../../../time/datasource/rr0/RR0CaseSummaryJson";
+import { CaseConclusion } from "./CaseConclusion";
+import { HynekClassification } from "./HynekClassification";
+export interface RR0CaseJson extends RR0CaseSummaryJson {
+    classification?: {
+        hynek: HynekClassification;
+    };
+    conclusion?: CaseConclusion;
+}

package/dist/science/crypto/ufo/enquete/dossier/RR0CaseJson.js

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

package/dist/source/SourceFactory.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { JSDOM } from "jsdom";
 import { FileContents } from "@javarome/fileutil";
 /**
@@ -65,7 +65,7 @@ export class SourceFactory {
         }
         const publication = source.publication;
         if (publication && !publication.time) {
-            publication.time = this.time.contextFromFileName(context, href);
+            publication.time = this.time.contextFromFileName(context, href).date;
         }
         if (hash) {
             source.index = hash;
@@ -94,7 +94,7 @@ export class SourceFactory {
             title = href;
         }
         publisher = resOut.headers.get("host");
-        const time = lastModif ? TimeContext.fromDate(new Date(lastModif)) : context.time;
+        const time = lastModif ? EdtfDate.fromDate(new Date(lastModif)) : context.time.date;
         const publication = { publisher, time };
         return {
             title,

package/dist/tech/info/soft/APIFactory.d.ts

@@ -1,6 +1,7 @@
 import { API } from "./API.js";
 import { RR0Data, RR0EventFactory, TypedDataFactory } from "@rr0/data";
-export declare class APIFactory extends TypedDataFactory<API> {
+import { APIJson } from "./APIJson";
+export declare class APIFactory extends TypedDataFactory<API, APIJson> {
     constructor(eventFactory: RR0EventFactory);
     createFromData(data: RR0Data): API;
 }

package/dist/tech/info/soft/APIJson.d.ts

@@ -0,0 +1,4 @@
+import { RR0DataJson } from "@rr0/data/dist/RR0DataJson";
+export interface APIJson extends RR0DataJson {
+    type: "api";
+}

package/dist/tech/info/soft/APIJson.js

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

package/dist/test/RR0TestUtil.d.ts

@@ -1,5 +1,6 @@
 import { HtmlRR0Context, RR0Context } from "../RR0Context.js";
 import { FileWriteConfig } from "ssg-api";
+import { CityService, CountryService, DepartmentService, OrganizationFactory, OrganizationService, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { PeopleFactory } from "../people/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
@@ -13,6 +14,12 @@ export declare class RR0TestUtil {
     readonly caseFactory: CaseFactory;
     readonly peopleFactory: PeopleFactory;
     readonly time: TimeTestUtil;
+    readonly orgService: OrganizationService<any, undefined>;
+    readonly cityService: CityService;
+    readonly orgFactory: OrganizationFactory;
+    readonly departmentService: DepartmentService;
+    readonly countryService: CountryService;
+    readonly regionService: RegionService;
     constructor(rootDir?: string, outDir?: string);
     newContext(inputFileName: string, contents?: string, locale?: string): RR0Context;
     filePath(inputFileName: string): string;

package/dist/test/RR0TestUtil.js

@@ -1,14 +1,14 @@
 import path from "path";
 import { RR0ContextImpl } from "../RR0Context.js";
 import { HtmlFileContents } from "ssg-api";
-import { OrganizationFactory } from "../org/index.js";
+import { cities, CityService, countries, CountryService, departments, DepartmentService, OrganizationFactory, OrganizationService, regions, RegionService } from "../org/index.js";
 import { CaseFactory } from "../science/index.js";
 import { PeopleFactory } from "../people/index.js";
 import { APIFactory } from "../tech/index.js";
 import { TimeTestUtil } from "../time/TimeTestUtil";
 import { TimeContext } from "@rr0/time";
 import { FileContents } from "@javarome/fileutil";
-import { AllDataService, RR0EventFactory, TypedDataFactory } from "@rr0/data";
+import { AllDataService, EventDataFactory, RR0EventFactory, TypedDataFactory } from "@rr0/data";
 export class RR0TestUtil {
     constructor(rootDir = "test", outDir = "out") {
         this.rootDir = rootDir;
@@ -28,8 +28,9 @@ export class RR0TestUtil {
             timeZoneName: "short"
         };
         const eventFactory = new RR0EventFactory();
-        const sightingFactory = new TypedDataFactory(eventFactory, "sighting", ["index"]);
-        const orgFactory = new OrganizationFactory(eventFactory);
+        const sightingFactory = new EventDataFactory(eventFactory, "sighting", ["index"]);
+        const orgFactory = this.orgFactory = new OrganizationFactory(eventFactory);
+        this.orgService = new OrganizationService([], "org", orgFactory, undefined);
         this.caseFactory = new CaseFactory(eventFactory);
         this.peopleFactory = new PeopleFactory(eventFactory);
         const apiFactory = new APIFactory(eventFactory);
@@ -40,6 +41,10 @@ export class RR0TestUtil {
             //   console.debug(data)
         });
         this.time = new TimeTestUtil(this);
+        const countryService = this.countryService = new CountryService(countries, "org", orgFactory, undefined);
+        const regionService = this.regionService = new RegionService(regions, "org", orgFactory, countryService);
+        const departmentService = this.departmentService = new DepartmentService(departments, "org", orgFactory, regionService);
+        this.cityService = new CityService(cities, "org", orgFactory, departmentService);
     }
     newContext(inputFileName, contents, locale = "fr") {
         const context = new RR0ContextImpl(locale, new TimeContext(), this.config);

package/dist/time/EventRenderer.d.ts

@@ -1,10 +1,11 @@
 import { HtmlRR0Context } from "../RR0Context.js";
 import { SourceFactory, SourceRenderer } from "../source/index.js";
 import { NoteRenderer } from "../note/index.js";
-import { NamedPlace } from "./datasource/index.js";
 import { TimeElementFactory } from "./html/TimeElementFactory.js";
 import { RR0Data, RR0Event } from "@rr0/data";
 import { Source } from "@rr0/data/dist/source";
+import { PlaceRenderer } from "../place/PlaceRenderer";
+import { Place } from "@rr0/place";
 /**
  * Render a case summary as HTML.
  */
@@ -13,8 +14,9 @@ export declare class EventRenderer<E extends RR0Event> {
     protected sourceFactory: SourceFactory;
     readonly sourceRenderer: SourceRenderer;
     protected timeElementFactory: TimeElementFactory;
+    placeRenderer: PlaceRenderer;
     constructor(noteRenderer: NoteRenderer, sourceFactory: SourceFactory, sourceRenderer: SourceRenderer, timeElementFactory: TimeElementFactory);
-    placeElement(context: HtmlRR0Context, namedPlace: NamedPlace): HTMLSpanElement;
+    placeElement(context: HtmlRR0Context, place: Place): HTMLSpanElement;
     renderEnd(context: HtmlRR0Context, event: RR0Data, container: HTMLElement): Promise<void>;
     render(context: HtmlRR0Context, event: E, container: HTMLElement): Promise<void>;
     renderNotes(context: HtmlRR0Context, notes: string[], container: HTMLElement): Promise<void>;

package/dist/time/EventRenderer.js

@@ -1,4 +1,5 @@
 import assert from "assert";
+import { PlaceRenderer } from "../place/PlaceRenderer";
 /**
  * Render a case summary as HTML.
  */
@@ -8,13 +9,14 @@ export class EventRenderer {
         this.sourceFactory = sourceFactory;
         this.sourceRenderer = sourceRenderer;
         this.timeElementFactory = timeElementFactory;
+        this.placeRenderer = new PlaceRenderer();
     }
-    placeElement(context, namedPlace) {
+    placeElement(context, place) {
         const doc = context.file.document;
-        const birthPlace = doc.createElement("span");
-        birthPlace.className = "place";
-        birthPlace.textContent = namedPlace.name || "";
-        return birthPlace;
+        const placeEl = doc.createElement("span");
+        placeEl.className = "place";
+        placeEl.textContent = this.placeRenderer.render(context, place) || "";
+        return placeEl;
     }
     async renderEnd(context, event, container) {
         const sources = event.sources;
@@ -29,7 +31,7 @@ export class EventRenderer {
     }
     async render(context, event, container) {
         const eventContext = context.clone();
-        const eventTime = eventContext.time = event.time;
+        const eventTime = eventContext.time.date = event.time;
         assert.ok(eventTime, `Event of type "${event.type}" has no time`);
         container.dataset.time = eventTime.toString();
         const timeEl = this.timeElementFactory.create(eventContext, context);

package/dist/time/TimeEventRenderer.test.js

@@ -1,14 +1,16 @@
 import { describe, expect, test } from "@javarome/testscript";
 import { CaseSummaryRenderer } from "./CaseSummaryRenderer.js";
 import { rr0TestUtil } from "../test/index.js";
-import { Place } from "../place/index.js";
-import { franceCity } from "../org/eu/fr/region/FranceCity.js";
 import { HttpSource } from "./datasource/index.js";
-import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 import { SourceFactory, SourceRenderer } from "../source/index.js";
 import { NoteFileCounter, NoteRenderer } from "../note/index.js";
 import { HautsDeSeineCityCode } from "../org/eu/fr/region/idf/92/HautsDeSeineCityCode.js";
 import { AllDataService } from "@rr0/data";
+import { Place } from "@rr0/place";
+import { OrganizationPlace } from "../place/OrganizationPlace";
+import { hautsDeSeine } from "../org/eu/fr/region/idf/92/HautsDeSeine";
+import { City } from "../org";
 describe("TimeEventRenderer", () => {
     const dataService = new AllDataService([]);
     const baseUrl = "https://rr0.org";
@@ -17,18 +19,8 @@ describe("TimeEventRenderer", () => {
     const renderer = new CaseSummaryRenderer(new NoteRenderer(new NoteFileCounter()), sourceFactory, new SourceRenderer(rr0TestUtil.time.timeTextBuilder), rr0TestUtil.time.timeElementFactory);
     test("render event", async () => {
         const context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html");
-        const city = franceCity(HautsDeSeineCityCode.Nanterre, Place.fromLocation(48.891944, 2.207222));
-        const dep = city.parent;
-        const region = dep.parent;
-        const countryMessages = context.messages.country;
-        const franceMessages = countryMessages.fr;
-        const idfMessages = franceMessages.region[region.id];
-        const hautsDeSeineMessages = idfMessages.department[dep.id];
-        const cityMessages = hautsDeSeineMessages.city[city.id];
-        const namedPlace = {
-            place: city.places[0],
-            name: cityMessages.toTitle(context, city)
-        };
+        const city = City.create(String(HautsDeSeineCityCode.Nanterre), hautsDeSeine, Place.fromLocation(48.891944, 2.207222));
+        const namedPlace = new OrganizationPlace(city);
         const sourceMonth = 12;
         const unreacheableSource = {
             events: [], previousSourceRefs: [],
@@ -37,13 +29,15 @@ describe("TimeEventRenderer", () => {
             authors: ["Some Author"],
             publication: {
                 publisher: "Some site",
-                time: TimeContext.fromDate(new Date(2001, sourceMonth - 1, 13))
+                time: EdtfDate.fromDate(new Date(2001, sourceMonth - 1, 13))
             }
         };
         const sources = [unreacheableSource];
         const c = {
-            events: [], type: "sighting",
-            time: context.time,
+            events: [],
+            type: "event",
+            eventType: "sighting",
+            time: context.time.date,
             place: namedPlace,
             description: "some sighting",
             sources

package/dist/time/TimeService.d.ts

@@ -1,14 +1,14 @@
 import { TimeRenderer } from "./html/TimeRenderer.js";
 import { TimeTextBuilder } from "./text/TimeTextBuilder.js";
 import { TimeUrlBuilder } from "./TimeUrlBuilder";
-import { AbstractDataService, AllDataService, RR0Event } from "@rr0/data";
+import { AbstractDataService, AllDataService, RR0Event, RR0EventJson } from "@rr0/data";
 import { HtmlRR0Context } from "../RR0Context";
 import { TimeContext } from "@rr0/time";
 export type TimeServiceOptions = {
     readonly root: string;
     readonly files: string[];
 };
-export declare class TimeService extends AbstractDataService<RR0Event> {
+export declare class TimeService extends AbstractDataService<RR0Event, RR0EventJson> {
     readonly textBuilder: TimeTextBuilder;
     readonly urlBuilder: TimeUrlBuilder;
     readonly timePathRegex: RegExp;

package/dist/time/TimeUrlBuilder.d.ts

@@ -1,4 +1,5 @@
 import { TimeContext } from "@rr0/time";
+import { Level2Date as EdtfDate } from "@rr0/time";
 export type TimeUrlBuilderOptions = {
     rootDir: string;
 };
@@ -6,4 +7,6 @@ export declare class TimeUrlBuilder {
     readonly options: TimeUrlBuilderOptions;
     constructor(options: TimeUrlBuilderOptions);
     fromContext(time: TimeContext): string;
+    fromEdtf(time: EdtfDate): string;
+    fromYYMMDD(year: number, month: number, day: number): string;
 }

package/dist/time/TimeUrlBuilder.js

@@ -4,18 +4,22 @@ export class TimeUrlBuilder {
         this.options = options;
     }
     fromContext(time) {
+        return this.fromYYMMDD(time.getYear(), time.getMonth(), time.getDayOfMonth());
+    }
+    fromEdtf(time) {
+        var _a, _b, _c;
+        return this.fromYYMMDD((_a = time.year) === null || _a === void 0 ? void 0 : _a.value, (_b = time.month) === null || _b === void 0 ? void 0 : _b.value, (_c = time.day) === null || _c === void 0 ? void 0 : _c.value);
+    }
+    fromYYMMDD(year, month, day) {
         let url = this.options.rootDir;
-        const year = time.getYear();
         if (year) {
             url = path.join(url, year.toString().split("").join("/"));
         }
-        let month = time.getMonth();
         if (month) {
-            url += "/" + month.toString().padStart(2, "0");
+            url += `/${month.toString().padStart(2, "0")}`;
         }
-        let day = time.getDayOfMonth();
         if (day) {
-            url += "/" + day.toString().padStart(2, "0");
+            url += `/${day.toString().padStart(2, "0")}`;
         }
         return url;
     }

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);