@open-charging-cloud/wwcp-poi 0.3.0 → 0.4.0

package/dist/index.js

@@ -270,7 +270,7 @@ var Parser = class {
   }
   parseObject(depth) {
     const object2 = {};
-    const names = /* @__PURE__ */ new Set();
+    const names2 = /* @__PURE__ */ new Set();
     this.position++;
     this.skipWhitespace();
     if (this.text[this.position] === "}") {
@@ -282,9 +282,9 @@ var Parser = class {
       if (this.text[this.position] !== '"')
         this.fail("expected a property name");
       const name = this.parseString();
-      if (names.has(name))
+      if (names2.has(name))
         this.fail(`the property '${name}' is named twice`);
-      names.add(name);
+      names2.add(name);
       this.skipWhitespace();
       if (this.text[this.position] !== ":")
         this.fail(`expected ':'`);
@@ -784,6 +784,11 @@ function firstText(i18n3) {
   const first2 = Object.values(i18n3)[0];
   return typeof first2 === "string" ? first2 : void 0;
 }
+var withArticle = (nounPhrase, capitalized2 = true) => (/^[aeio]/iu.test(nounPhrase) ? capitalized2 ? "An " : "an " : capitalized2 ? "A " : "a ") + nounPhrase;
+function numberText(value) {
+  const text2 = value.toString();
+  return text2.includes(".") ? text2.replace(/\.?0+$/u, "") : text2;
+}
 var DIGEST_LENGTH = {
   sha256: 32,
   sha384: 48,
@@ -1348,6 +1353,7 @@ var CHARGING_STATION_RULES = {
     "address",
     "geoLocation",
     "hotline",
+    "webPaymentURL",
     "manufacturerId",
     "modelId",
     "modelURL",
@@ -1378,6 +1384,7 @@ var CHARGING_POOL_RULES = {
     "parkingType",
     "accessibility",
     "hotline",
+    "webPaymentURL",
     "gridConnectionPointId",
     "openingTimes",
     "energyMix",
@@ -1746,11 +1753,11 @@ function optionalIds(json, property, description, parser) {
     return parsed;
   });
 }
-function optionalEnum(json, property, description, names) {
+function optionalEnum(json, property, description, names2) {
   const value = get(json, property);
   if (value === void 0)
     return void 0;
-  if (typeof value !== "string" || !names.includes(value))
+  if (typeof value !== "string" || !names2.includes(value))
     throw new POIError(`Invalid ${description} '${tokenText(value)}'!`);
   return value;
 }
@@ -1883,7 +1890,7 @@ var sameId = (left, right) => left !== void 0 && right !== void 0 && ignoringCas
 var sameText = (left, right) => left === void 0 ? right === void 0 : sameId(left, right);
 function distinct(values, key2, description) {
   if (new Set(values.map(key2)).size !== values.length)
-    throw new POIError(`An ${description} must not be given twice!`);
+    throw new POIError(`${withArticle(description)} must not be given twice!`);
   return [...values];
 }
 var isBlank = (text2) => trimmed(text2).length === 0;
@@ -1923,7 +1930,7 @@ function checkPartyKeys(keys, name) {
   for (const [list, description] of [[keys.signingKeys, "signing key"], [keys.identityKeys, "identity key"]]) {
     const ids2 = list.map((key2) => key2.id);
     if (new Set(ids2).size !== ids2.length)
-      return `An ${description} of ${name} must not be given twice!`;
+      return `${withArticle(`${description} of ${name}`)} must not be given twice!`;
   }
   const signingIds = keys.signingKeys.map((key2) => key2.id).sort(ordinal);
   const identities = [...keys.identityKeys].sort((a, b) => ordinal(a.id, b.id));
@@ -2200,8 +2207,8 @@ ZW|ZWE|716|263|Zimbabwe
 YY|YYY|999|999|Testland
 `;
 var ALL = TABLE.trim().split("\n").map((line) => {
-  const [alpha2 = "", alpha3 = "", numeric = "", calling = "", ...names] = line.split("|");
-  return { alpha2, alpha3, numeric: Number(numeric), calling: Number(calling), names };
+  const [alpha2 = "", alpha3 = "", numeric = "", calling = "", ...names2] = line.split("|");
+  return { alpha2, alpha3, numeric: Number(numeric), calling: Number(calling), names: names2 };
 });
 var by = (keys) => {
   const countries = /* @__PURE__ */ new Map();
@@ -2230,7 +2237,7 @@ var EV_TALER_EXCHANGE_CONTEXT = CONTEXT_PREFIX + "roamingNetwork/evTalerExchange
 var EV_TALER_PAYMENT_OPTION = "EVTaler";
 var EV_TALER_PAYMENT_MEANS = "EV_TALER";
 var CROCKFORD_BASE32 = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
-var MERCHANT_PROPERTIES = ["@context", "merchantBaseURL", "merchantPublicKey", "exchanges"];
+var MERCHANT_PROPERTIES = ["@context", "merchantBaseURL", "merchantPublicKey", "exchanges", "offersURL"];
 var EXCHANGE_PROPERTIES = ["@context", "masterPublicKey", "baseURL", "currency", "name"];
 var CURRENCIES = new Set(`EUR CHF USD CZK GBP HRK PLN RON RSD RUB SEK AED AFN ALL AMD AOA ARS AUD AWG AZN BAM BBD BDT BGN BHD BIF
                             BMD BND BOB BRL BSD BTN BWP BYN BZD CAD CDF CLP CNY COP CRC CUP CVE DJF DKK DOP DZD EGP ERN ETB FJD FKP
@@ -2333,6 +2340,8 @@ function notWrittenAsRead(json, read) {
       return `The EV Taler merchant must not name the property '${property2}'!`;
     if (get(json, "merchantBaseURL") !== read.merchantBaseURL)
       return `The merchant base URL '${tokenText(get(json, "merchantBaseURL") ?? "")}' is written as '${read.merchantBaseURL}'!`;
+    if (read.offersURL !== void 0 && get(json, "offersURL") !== read.offersURL)
+      return `The offers URL '${tokenText(get(json, "offersURL") ?? "")}' is written as '${read.offersURL}'!`;
     return void 0;
   }
   const exchange = (error) => `Invalid exchange of an EV Taler merchant: ${error}`;
@@ -2400,9 +2409,15 @@ function evTalerMerchantOf(value) {
     exchanges.push(exchange);
     read.push([exchangeJSON, exchange]);
   }
+  const offersURL = urlOf(value, "offersURL", "offers URL of an EV Taler merchant");
+  if (typeof offersURL === "string")
+    return invalid(offersURL);
   const urlError = invalidBaseURL(merchantBaseURL, "merchant base URL");
   if (urlError !== void 0)
     return invalid(`${urlError} (Parameter 'MerchantBaseURL')`);
+  const offersURLError = offersURL === void 0 ? void 0 : invalidBaseURL(offersURL, "offers URL");
+  if (offersURLError !== void 0)
+    return invalid(`${offersURLError} (Parameter 'OffersURL')`);
   if (exchanges.length === 0)
     return invalid("A merchant accepts at least one exchange! (Parameter 'Exchanges')");
   if (new Set(exchanges.map((exchange) => exchange.masterPublicKey)).size !== exchanges.length)
@@ -2410,7 +2425,8 @@ function evTalerMerchantOf(value) {
   const merchant = {
     merchantBaseURL: merchantBaseURL.text,
     merchantPublicKey,
-    exchanges: exchanges.sort((left, right) => ordinal(left.masterPublicKey, right.masterPublicKey))
+    exchanges: exchanges.sort((left, right) => ordinal(left.masterPublicKey, right.masterPublicKey)),
+    ...offersURL === void 0 ? {} : { offersURL: offersURL.text }
   };
   const notWritten2 = notWrittenAsRead(value, merchant) ?? read.map(([json, exchange]) => notWrittenAsRead(json, exchange)).find((error) => error !== void 0);
   return notWritten2 === void 0 ? merchant : invalid(notWritten2);
@@ -2599,18 +2615,18 @@ function ids(json, property, description, parser) {
   }
   return parsed;
 }
-function flags(json, property, description, names) {
+function flags(json, property, description, names2) {
   const value = get(json, property);
   if (value === void 0)
     return void 0;
   if (!isArray(value))
     return `The ${description} must be a JSON array!`;
-  const invalid = value.find((item) => typeof item !== "string" || !names.includes(item));
+  const invalid = value.find((item) => typeof item !== "string" || !names2.includes(item));
   return invalid === void 0 ? void 0 : `Invalid ${description} '${interpolated(invalid)}'!`;
 }
-function enumeration(json, property, description, names) {
+function enumeration(json, property, description, names2) {
   const value = get(json, property);
-  return value === void 0 || typeof value === "string" && names.includes(value) ? void 0 : `Invalid ${description} '${interpolated(value)}'!`;
+  return value === void 0 || typeof value === "string" && names2.includes(value) ? void 0 : `Invalid ${description} '${interpolated(value)}'!`;
 }
 function texts(json, property, description) {
   const value = get(json, property);
@@ -2867,7 +2883,7 @@ function twice2(items) {
   }
   return void 0;
 }
-var givenTwice2 = (items, description) => twice2(items) === void 0 ? void 0 : new Thrown(`${description} must not be given twice!`);
+var givenTwice2 = (items, description) => twice2(items) === void 0 ? void 0 : new Thrown(`${withArticle(description)} must not be given twice!`);
 function raise(error) {
   if (error !== void 0)
     throw error;
@@ -4800,9 +4816,9 @@ function dataLicenses(json) {
       const id = dataLicense(license);
       if (id instanceof Refused)
         return `Invalid data license: ${id.error}`;
-      if (given2.has(id))
+      if (given2.has(ignoringCase(id)))
         return `The data license '${id}' must not be given twice!`;
-      given2.add(id);
+      given2.add(ignoringCase(id));
     }
   }
   if (licenseIds !== void 0) {
@@ -4814,9 +4830,9 @@ function dataLicenses(json) {
         return `Invalid data license identification '${interpolated(item)}'!`;
       if (!KNOWN_DATA_LICENSES.includes(id.toUpperCase()))
         return `The data license '${id}' is not well-known, so it must be given completely!`;
-      if (given2.has(id))
+      if (given2.has(ignoringCase(id)))
         return `The data license '${id}' must not be given twice!`;
-      given2.add(id);
+      given2.add(ignoringCase(id));
     }
   }
   return void 0;
@@ -4885,7 +4901,7 @@ function openingTimes(json) {
         if (begin === void 0 || end === void 0)
           return `Invalid regular hours '${interpolated(period)}' on ${day}!`;
         if (end[0] < begin[0] && end[0] !== 0 || end[0] === begin[0] && end[1] < begin[1] && end[1] !== 0)
-          return `Invalid opening times: The end period '${hhmm(end)}h' must be after the start period '${hhmm(begin)}h'! (Parameter 'PeriodEnd')`;
+          return `The end period '${hhmm(end)}h' must be after the start period '${hhmm(begin)}h'! (Parameter 'PeriodEnd')`;
       }
     }
   }
@@ -5035,10 +5051,12 @@ function keyError(id, key2, chain) {
   return computed === id ? void 0 : `The identification '${id}' of a measurement public key is not the SHA-256 '${computed}' of its key!`;
 }
 var transparencySoftwareAssignment = (json) => context(json, contextOf2("transparencySoftwareAssignment"), `The JSON-LD context of the transparency software status must be '${contextOf2("transparencySoftwareAssignment")}'!`) ?? (get(json, "certificateId") !== void 0 ? "A transparency software status names no certificateId: the certificates of the energy meter and of its charging station prove it!" : void 0) ?? textError(json, "transparencySoftwareId", "transparency software identification", nonEmpty) ?? textError(json, "legalStatus", "legal status", nonEmpty) ?? (get(json, "transparencySoftwareId") === void 0 || get(json, "legalStatus") === void 0 ? "A transparency software status needs its transparencySoftwareId and its legalStatus!" : void 0);
+var SECURE_DYNAMIC_QR_CODE_CHANNELS = ["BLE", "Display", "NFC"];
+var SECURE_DYNAMIC_QR_CODE = "SecureDynamicQRCode";
 function authenticationMode(json) {
   try {
     const type = get(json, "type");
-    const error = context(json, contextOf2("authenticationMode"), `The JSON-LD context of the authentication mode must be '${contextOf2("authenticationMode")}'!`) ?? text(json, "type", "authentication mode type") ?? errorOf(idsByName(json, "cardTypes", "RFID card type", ["MifareClassic", "MifareDESFire", "Calypso"])) ?? brands(json) ?? text(json, "number", "number") ?? text(json, "stationCode", "station code") ?? (type === void 0 ? "An authentication mode needs its type!" : void 0);
+    const error = context(json, contextOf2("authenticationMode"), `The JSON-LD context of the authentication mode must be '${contextOf2("authenticationMode")}'!`) ?? text(json, "type", "authentication mode type") ?? errorOf(idsByName(json, "cardTypes", "RFID card type", ["MifareClassic", "MifareDESFire", "Calypso"])) ?? brands(json) ?? text(json, "number", "number") ?? text(json, "stationCode", "station code") ?? errorOf(idsByName(json, "channels", "channel of the secure dynamic QR code", SECURE_DYNAMIC_QR_CODE_CHANNELS)) ?? (type === void 0 ? "An authentication mode needs its type!" : void 0);
     if (error !== void 0 || typeof type !== "string")
       return error;
     if (trimmed(type) === "" || trimmed(type) !== type)
@@ -5046,6 +5064,9 @@ function authenticationMode(json) {
     const cardTypes = idsByName(json, "cardTypes", "RFID card type", []);
     if (new Set(cardTypes).size !== cardTypes.length)
       throw new Thrown("An RFID card type must not be given twice! (Parameter 'CardTypes')");
+    const channels = idsByName(json, "channels", "channel of the secure dynamic QR code", []);
+    if (new Set(channels).size !== channels.length)
+      throw new Thrown("A channel of the secure dynamic QR code must not be given twice! (Parameter 'Channels')");
     const brandIds = (isArray(get(json, "brands")) ? get(json, "brands") : []).flatMap((item) => {
       const id = isObject(item) && typeof item["@id"] === "string" ? freeId(item["@id"]) : void 0;
       return id === void 0 ? [] : [id];
@@ -5066,6 +5087,11 @@ function authenticationMode(json) {
       throw new Thrown(`Only SMS and PhoneCall name a number, not '${type}'! (Parameter 'Number')`);
     if (get(json, "stationCode") !== void 0 && type !== "SMS")
       throw new Thrown(`Only SMS names a station code, not '${type}'! (Parameter 'StationCode')`);
+    if (type === SECURE_DYNAMIC_QR_CODE) {
+      if (channels.length === 0)
+        throw new Thrown(`The authentication mode '${type}' needs the channels its URL is given over: ${SECURE_DYNAMIC_QR_CODE_CHANNELS.join(", ")}! (Parameter 'Channels')`);
+    } else if (channels.length > 0)
+      throw new Thrown(`Only ${SECURE_DYNAMIC_QR_CODE} names channels, not '${type}'! (Parameter 'Channels')`);
     return void 0;
   } catch (e) {
     if (e instanceof Thrown)
@@ -5073,13 +5099,13 @@ function authenticationMode(json) {
     throw e;
   }
 }
-var idsByName = (json, property, description, names) => {
+var idsByName = (json, property, description, names2) => {
   const value = get(json, property);
   if (value === void 0)
     return [];
   if (!isArray(value))
     return new Refused(`The ${description} must be a JSON array!`);
-  const invalid = names.length === 0 ? void 0 : value.find((item) => typeof item !== "string" || !names.includes(item));
+  const invalid = names2.length === 0 ? void 0 : value.find((item) => typeof item !== "string" || !names2.includes(item));
   return invalid === void 0 ? value.filter((item) => typeof item === "string") : new Refused(`Invalid ${description} '${interpolated(invalid)}'!`);
 };
 var relatedLocation = (json) => context(json, contextOf2("additionalGeoLocation"), `The JSON-LD context of the related location must be '${contextOf2("additionalGeoLocation")}'!`) ?? geoLocationError(json, "geoLocation", "geo location") ?? i18n(json, "name") ?? (get(json, "geoLocation") === void 0 ? "A related location needs its geo location!" : void 0);
@@ -5637,6 +5663,7 @@ var STATION_SINGLES = [
   "address",
   "geoLocation",
   "hotline",
+  "webPaymentURL",
   "manufacturerId",
   "modelId",
   "modelURL",
@@ -5795,8 +5822,7 @@ function powerSum(station, evses, id) {
     const scale = Math.max(left.scale, right.scale);
     return new Decimal(left.mantissa * 10n ** BigInt(scale - left.scale) + right.mantissa * 10n ** BigInt(scale - right.scale), scale);
   }, new Decimal(0n, 0));
-  const watt = (value) => value.mantissa === 0n ? "0" : value.toString();
-  return maxPower.compareTo(sum2) > 0 ? `The maximum power of the charging station '${id}', ${watt(maxPower)} W, must not exceed the ${watt(sum2)} W of all its EVSEs together! (Parameter 'MaxPower')` : void 0;
+  return maxPower.compareTo(sum2) > 0 ? `The maximum power of the charging station '${id}', ${numberText(maxPower)} W, must not exceed the ${numberText(sum2)} W of all its EVSEs together! (Parameter 'MaxPower')` : void 0;
 }
 var invalidGroupOrOffer = (operator) => whileChecking(() => groupOrOfferError(operator));
 function groupOrOfferError(operator) {
@@ -5999,9 +6025,16 @@ function newProviderOfferOverlap(network, before) {
   return void 0;
 }
 var invalidPaymentOption = (operator) => whileChecking(() => paymentOptionError(operator));
+var namesSecureDynamicQRCode = (authenticationModes) => isArray(authenticationModes) && authenticationModes.some((mode) => isObject(mode) && mode["type"] === SECURE_DYNAMIC_QR_CODE);
 function paymentOptionError(operator) {
-  if (get(operator, "evTaler") !== void 0)
+  if (get(operator, "evTaler") !== void 0) {
+    for (const pool of poolsOf(operator)) {
+      const effective = [pool, ...templatesOf2(pool, operator, "chargingPoolTemplates", poolTemplateId)];
+      if (effective.some((entity) => namesEVTaler(get(entity, "paymentOptions"))) && !effective.some((entity) => namesSecureDynamicQRCode(get(entity, "authenticationModes"))))
+        return `The charging pool '${textOf2(pool, poolId)}' names the payment option '${EV_TALER_PAYMENT_OPTION}' without the authentication mode '${SECURE_DYNAMIC_QR_CODE}': an EV Taler session names the one-time password its EVSE gives right then!`;
+    }
     return void 0;
+  }
   const id = textOf2(operator, operatorId);
   for (const [property, parser, what] of [["chargingPools", poolId, "charging pool"], ["chargingPoolTemplates", poolTemplateId, "charging pool template"]])
     for (const entity of sortedAt(operator, property, parser))
@@ -6023,13 +6056,23 @@ function construct(operator, id, of) {
     if (later !== void 0)
       fail(`The ${description} '${later}' of the operator '${id}' must not be given twice!`, "Children");
   };
-  const operatorOf3 = (entity, parser) => textOf2(entity, parser).slice(0, 6);
+  const operatorOf2 = (entity, parser) => textOf2(entity, parser).slice(0, 6);
   for (const pool of objectsAt(operator, "chargingPools"))
-    if (operatorOf3(pool, poolId) !== id)
+    if (operatorOf2(pool, poolId) !== id)
       fail(`The charging pool '${textOf2(pool, poolId)}' does not belong to the operator '${id}'!`, "ChargingPools");
   ofOperator(objectsAt(operator, "chargingPools"), poolId, "charging pool");
+  const stations = poolsOf(operator).flatMap(stationsOf);
+  for (const [entities, parser, description] of [
+    [stations, stationId, "charging station"],
+    [stations.flatMap(evsesOf), evseId, "EVSE"],
+    [metersOfOperator(operator), freeId, "energy meter"]
+  ]) {
+    const later = laterTwice(entities, parser);
+    if (later !== void 0)
+      fail(`The ${description} '${later}' of the operator '${id}' must not be given twice!`, "ChargingPools");
+  }
   for (const tariff2 of objectsAt(operator, "chargingTariffs"))
-    if (operatorOf3(tariff2, tariffId) !== id)
+    if (operatorOf2(tariff2, tariffId) !== id)
       fail(`The charging tariff '${textOf2(tariff2, tariffId)}' does not belong to the operator '${id}'!`, "ChargingTariffs");
   ofOperator(objectsAt(operator, "chargingTariffs"), tariffId, "charging tariff");
   const tariffs = keysAt(operator, "chargingTariffs", tariffId);
@@ -6052,7 +6095,7 @@ function construct(operator, id, of) {
   ]) {
     ofOperator(objectsAt(operator, property), parser, description);
     for (const group2 of sortedAt(operator, property, parser))
-      if (operatorOf3(group2, parser) !== id)
+      if (operatorOf2(group2, parser) !== id)
         fail(`The group '${textOf2(group2, parser)}' does not belong to the operator '${id}'!`, parameter);
   }
   ofOperator(objectsAt(operator, "energyMeterGroups"), freeId, "energy meter group");
@@ -6072,7 +6115,7 @@ function construct(operator, id, of) {
   ofOperator(objectsAt(operator, "energyMeterTemplates"), freeId, "energy meter template");
   for (const [property, parser, , parameter] of templateKinds)
     for (const template of sortedAt(operator, property, parser)) {
-      if (operatorOf3(template, parser) !== id)
+      if (operatorOf2(template, parser) !== id)
         fail(`The template '${textOf2(template, parser)}' does not belong to the operator '${id}'!`, parameter);
       const tariff2 = property === "chargingTariffTemplates" ? void 0 : idOf3(template, tariffId, "chargingTariffId");
       if (tariff2 !== void 0 && !tariffs.has(tariff2.key))
@@ -6632,11 +6675,11 @@ var energyMeter = (json) => caught("an energy meter", () => {
   if (error !== void 0)
     return error;
   const of = `the energy meter '${id.text}'`;
-  raise(givenTwice2(idsAt(json, "templateIds", freeId), `A template of ${of}`));
-  raise(givenTwice2(releasesAt(json), `A transparency software release of ${of}`));
-  raise(givenTwice2(namesAt(json, "signatureMethods"), `A signature method of ${of}`));
-  raise(givenTwice2(publicKeysAt(json), `An public key of ${of}`));
-  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `A certificate of ${of}`));
+  raise(givenTwice2(idsAt(json, "templateIds", freeId), `template of ${of}`));
+  raise(givenTwice2(releasesAt(json), `transparency software release of ${of}`));
+  raise(givenTwice2(namesAt(json, "signatureMethods"), `signature method of ${of}`));
+  raise(givenTwice2(publicKeysAt(json), `public key of ${of}`));
+  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `certificate of ${of}`));
   return void 0;
 });
 function embeddedEnergyMeter(json) {
@@ -6654,9 +6697,9 @@ var energyMeterTemplate = (json) => caught("an energy meter template", () => {
   if (error !== void 0)
     return error;
   const of = `the energy meter template '${id.text}'`;
-  raise(givenTwice2(releasesAt(json), `A transparency software release of ${of}`));
-  raise(givenTwice2(namesAt(json, "signatureMethods"), `A signature method of ${of}`));
-  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `A certificate of ${of}`));
+  raise(givenTwice2(releasesAt(json), `transparency software release of ${of}`));
+  raise(givenTwice2(namesAt(json, "signatureMethods"), `signature method of ${of}`));
+  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `certificate of ${of}`));
   return void 0;
 });
 var EVSE_GROUP = { what: "EVSE group", article: "an", kind: "evseGroup", id: evseGroupId, members: "EVSEIds", member: evseId };
@@ -6671,7 +6714,7 @@ var group = (kind) => (json) => caught(`${kind.article} ${kind.what}`, () => {
   const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? errorOf(ids(json, kind.members, "member identification", kind.member)) ?? metadata(json);
   if (error !== void 0)
     return error;
-  raise(givenTwice2(idsAt(json, kind.members, kind.member), `A member of the ${kind.what} '${id.text}'`));
+  raise(givenTwice2(idsAt(json, kind.members, kind.member), `member of the ${kind.what} '${id.text}'`));
   return void 0;
 });
 var memberGroups = (json) => children(json, "EVSEGroups", "EVSEGroupIds", "EVSEGroups", group(EVSE_GROUP)) ?? children(json, "chargingStationGroups", "chargingStationGroupIds", "ChargingStationGroups", group(CHARGING_STATION_GROUP)) ?? children(json, "chargingPoolGroups", "chargingPoolGroupIds", "ChargingPoolGroups", group(CHARGING_POOL_GROUP));
@@ -6688,9 +6731,9 @@ var chargingConnector = (json) => caught("a charging connector", () => {
   if (error !== void 0)
     return error;
   const of = `the charging connector '${id.text}'`;
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(idsAt(json, "chargingTariffIds", tariffId), `A charging tariff of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(idsAt(json, "chargingTariffIds", tariffId), `charging tariff of ${of}`));
   if (cableLength instanceof Decimal && signOf(cableLength) <= 0)
     return `The cable length of ${of} must be positive!`;
   if (cableWeight instanceof Decimal && signOf(cableWeight) <= 0)
@@ -6719,13 +6762,13 @@ var evse = (json) => caught("an EVSE", () => {
   if (error !== void 0)
     return error;
   const of = `the EVSE '${id.text}'`;
-  raise(givenTwice2(idsAt(json, "templateIds", evseTemplateId), `A template of ${of}`));
+  raise(givenTwice2(idsAt(json, "templateIds", evseTemplateId), `template of ${of}`));
   evseConstruction(json, of);
-  raise(givenTwice2(idsAt(json, "chargingTariffIds", tariffId), `A charging tariff of ${of}`));
+  raise(givenTwice2(idsAt(json, "chargingTariffIds", tariffId), `charging tariff of ${of}`));
   collection(objectsOf3(get(json, "brands")), freeId, "brand", of);
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(idsAt(json, "acceptedEMobilityProviderIds", providerId), `A accepted e-mobility provider of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(idsAt(json, "acceptedEMobilityProviderIds", providerId), `accepted e-mobility provider of ${of}`));
   return void 0;
 });
 var evseTemplate = (json) => caught("an EVSE template", () => {
@@ -6738,21 +6781,21 @@ var evseTemplate = (json) => caught("an EVSE template", () => {
   const of = `the EVSE template '${id.text}'`;
   evseConstruction(json, of);
   collection(objectsOf3(get(json, "brands")), freeId, "brand", of);
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(idsAt(json, "acceptedEMobilityProviderIds", providerId), `A accepted e-mobility provider of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(idsAt(json, "acceptedEMobilityProviderIds", providerId), `accepted e-mobility provider of ${of}`));
   return void 0;
 });
-var stationModel = (json, serialNumber) => textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "manufacturerId", "manufacturer identification", nonEmpty) ?? textError(json, "modelId", "model identification", nonEmpty) ?? textError(json, "modelURL", "model URL", url) ?? (serialNumber ? textError(json, "serialNumber", "serial number", exactText) : void 0) ?? textError(json, "hardwareRevision", "hardware revision", exactText) ?? textError(json, "firmwareVersion", "firmware version", exactText) ?? objects2(json, "transparencySoftwareStatus", "transparency software status", transparencySoftwareAssignment) ?? errorOf(ids(json, "signatureMethods", "signature method", nonEmpty));
+var stationModel = (json, serialNumber) => textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "webPaymentURL", "web payment URL", url) ?? textError(json, "manufacturerId", "manufacturer identification", nonEmpty) ?? textError(json, "modelId", "model identification", nonEmpty) ?? textError(json, "modelURL", "model URL", url) ?? (serialNumber ? textError(json, "serialNumber", "serial number", exactText) : void 0) ?? textError(json, "hardwareRevision", "hardware revision", exactText) ?? textError(json, "firmwareVersion", "firmware version", exactText) ?? objects2(json, "transparencySoftwareStatus", "transparency software status", transparencySoftwareAssignment) ?? errorOf(ids(json, "signatureMethods", "signature method", nonEmpty));
 var stationLists = (json) => errorOf(ids(json, "vehicleTypes", "vehicle type", nonEmpty)) ?? errorOf(ids(json, "euVehicleCategories", "EU vehicle category", nonEmpty)) ?? textError(json, "accessibility", "accessibility", nonEmpty) ?? errorOf(ids(json, "features", "charging station feature", nonEmpty)) ?? textError(json, "calibrationInfo", "calibration information", url) ?? textError(json, "certificationInfo", "certification information", url) ?? errorOf(ids(json, "parkingSpaceIds", "parking space identification", freeId)) ?? errorOf(ids(json, "certificateIds", "certificate identification", freeId)) ?? errorOf(optionalDecimal2(json, "maxPower", "maximum power"));
 function stationListsConstruction(json, of) {
   collection(objectsOf3(get(json, "brands")), freeId, "brand", of);
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(namesAt(json, "vehicleTypes"), `A vehicle type of ${of}`));
-  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `A EU vehicle category of ${of}`));
-  raise(givenTwice2(namesAt(json, "features"), `A feature of ${of}`));
-  raise(givenTwice2(idsAt(json, "parkingSpaceIds", freeId), `A parking space of ${of}`));
-  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `A certificate of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(namesAt(json, "vehicleTypes"), `vehicle type of ${of}`));
+  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `EU vehicle category of ${of}`));
+  raise(givenTwice2(namesAt(json, "features"), `feature of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingSpaceIds", freeId), `parking space of ${of}`));
+  raise(givenTwice2(idsAt(json, "certificateIds", freeId), `certificate of ${of}`));
 }
 function powerSumError(station, evses, id) {
   const maxPower = optionalDecimal2(station, "maxPower", "");
@@ -6763,8 +6806,7 @@ function powerSumError(station, evses, id) {
     const scale = Math.max(left.scale, right.scale);
     return new Decimal(left.mantissa * 10n ** BigInt(scale - left.scale) + right.mantissa * 10n ** BigInt(scale - right.scale), scale);
   }, new Decimal(0n, 0));
-  const watt = (value) => value.mantissa === 0n ? "0" : value.toString();
-  return maxPower.compareTo(sum2) > 0 ? thrown(`The maximum power of the charging station '${id}', ${watt(maxPower)} W, must not exceed the ${watt(sum2)} W of all its EVSEs together!`, "MaxPower") : void 0;
+  return maxPower.compareTo(sum2) > 0 ? thrown(`The maximum power of the charging station '${id}', ${numberText(maxPower)} W, must not exceed the ${numberText(sum2)} W of all its EVSEs together!`, "MaxPower") : void 0;
 }
 var chargingStation = (json) => caught("a charging station", () => {
   const id = header(json, "charging station identification", stationId, "chargingStation", "charging station");
@@ -6776,7 +6818,7 @@ var chargingStation = (json) => caught("a charging station", () => {
   const of = `the charging station '${id.text}'`;
   const evses = objectsOf3(get(json, "EVSEs"));
   const operator = id.text.slice(0, 6);
-  raise(givenTwice2(idsAt(json, "templateIds", stationTemplateId), `A template of ${of}`));
+  raise(givenTwice2(idsAt(json, "templateIds", stationTemplateId), `template of ${of}`));
   if (isNegative2(optionalDecimal2(json, "maxPower", "")))
     throw thrown(`The maximum power of ${of} must not be negative!`, "MaxPower");
   for (const item of evses) {
@@ -6785,9 +6827,9 @@ var chargingStation = (json) => caught("a charging station", () => {
       throw thrown(`The EVSE '${evseOf.text}' does not belong to the operator '${operator}' of ${of}!`, "EVSEs");
   }
   raise(powerSumError(json, evses, id.text));
-  raise(givenTwice2(releasesAt(json), `A transparency software release of ${of}`));
-  raise(givenTwice2(namesAt(json, "signatureMethods"), `A signature method of ${of}`));
-  raise(givenTwice2(publicKeysAt(json), `An public key of ${of}`));
+  raise(givenTwice2(releasesAt(json), `transparency software release of ${of}`));
+  raise(givenTwice2(namesAt(json, "signatureMethods"), `signature method of ${of}`));
+  raise(givenTwice2(publicKeysAt(json), `public key of ${of}`));
   collection(evses, evseId, "EVSE", of);
   if (twice2(objectsOf3(get(json, "energyMeters")).flatMap((meter) => idOf3(meter, freeId) ?? [])) !== void 0)
     throw thrown(`An energy meter of ${of} must not be given twice!`, "EnergyMeters");
@@ -6804,8 +6846,8 @@ var chargingStationTemplate = (json) => caught("a charging station template", ()
   const of = `the charging station template '${id.text}'`;
   if (isNegative2(optionalDecimal2(json, "maxPower", "")))
     throw thrown(`The maximum power of ${of} must not be negative!`, "MaxPower");
-  raise(givenTwice2(releasesAt(json), `A transparency software release of ${of}`));
-  raise(givenTwice2(namesAt(json, "signatureMethods"), `A signature method of ${of}`));
+  raise(givenTwice2(releasesAt(json), `transparency software release of ${of}`));
+  raise(givenTwice2(namesAt(json, "signatureMethods"), `signature method of ${of}`));
   stationListsConstruction(json, of);
   return void 0;
 });
@@ -6814,19 +6856,19 @@ var nutsCode = (given2) => /^[A-Z]{2}[A-Z0-9]{0,3}$/u.test(trimmed(given2).toUpp
 function poolListsConstruction(json, of) {
   const authenticationModes = objectsOf3(get(json, "authenticationModes")).map((mode) => ({ text: asText(mode["type"]), key: asText(mode["type"]) }));
   const relatedLocations = objectsOf3(get(json, "relatedLocations")).map((location) => ({ text: "", key: canonicalJSON([location["geoLocation"] ?? null, location["name"] ?? null]) }));
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
   raise(timeZoneError(json, of));
-  raise(givenTwice2(namesAt(json, "facilities"), `A facility of ${of}`));
-  raise(givenTwice2(namesAt(json, "paymentOptions"), `A payment option of ${of}`));
-  raise(givenTwice2(authenticationModes, `An authentication mode of ${of}`));
-  raise(givenTwice2(namesAt(json, "uiFeatures"), `A user interface feature of ${of}`));
-  raise(givenTwice2(namesAt(json, "features"), `A feature of ${of}`));
-  raise(givenTwice2(keyed(idsByNameAt(json, "locationLanguages"), (name) => name), `A language of ${of}`));
-  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `A parking restriction of ${of}`));
-  raise(givenTwice2(relatedLocations, `An related location of ${of}`));
-  raise(givenTwice2(namesAt(json, "services"), `A service of ${of}`));
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(keyed(idsAt(json, "nutsCodes", freeId).map((code) => code.text.toUpperCase()), (name) => name), `A NUTS code of ${of}`));
+  raise(givenTwice2(namesAt(json, "facilities"), `facility of ${of}`));
+  raise(givenTwice2(namesAt(json, "paymentOptions"), `payment option of ${of}`));
+  raise(givenTwice2(authenticationModes, `authentication mode of ${of}`));
+  raise(givenTwice2(namesAt(json, "uiFeatures"), `user interface feature of ${of}`));
+  raise(givenTwice2(namesAt(json, "features"), `feature of ${of}`));
+  raise(givenTwice2(keyed(idsByNameAt(json, "locationLanguages"), (name) => name), `language of ${of}`));
+  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `parking restriction of ${of}`));
+  raise(givenTwice2(relatedLocations, `related location of ${of}`));
+  raise(givenTwice2(namesAt(json, "services"), `service of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(keyed(idsAt(json, "nutsCodes", freeId).map((code) => code.text.toUpperCase()), (name) => name), `NUTS code of ${of}`));
 }
 function timeZoneError(json, of) {
   const timeZone2 = get(json, "timeZone");
@@ -6841,13 +6883,13 @@ var chargingPool = (json) => caught("a charging pool", () => {
   const id = header(json, "charging pool identification", poolId, "chargingPool", "charging pool");
   if (id instanceof Refused)
     return id.error;
-  const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? textError(json, "parkingType", "parking type", nonEmpty) ?? textError(json, "accessibility", "accessibility", nonEmpty) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? dataLicenses(json) ?? children(json, "chargingStations", "chargingStationIds", "charging stations", chargingStation) ?? (get(json, "gridConnectionPoint") !== void 0 ? `The grid connection point of the charging pool '${id.text}' is embedded in its grid operator: name it by 'gridConnectionPointId'!` : void 0) ?? textError(json, "gridConnectionPointId", "grid connection point identification", nonEmpty) ?? energyMeters(json) ?? brands(json) ?? object(json, "openingTimes", "opening times", openingTimes) ?? object(json, "energyMix", "energy mix", energyMix) ?? objects2(json, "images", "images", image) ?? poolLists(json) ?? optionalBoolean(json, "chargingWhenClosed", "charging when closed") ?? errorOf(ids(json, "templateIds", "template identification", poolTemplateId)) ?? metadata(json);
+  const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? textError(json, "parkingType", "parking type", nonEmpty) ?? textError(json, "accessibility", "accessibility", nonEmpty) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "webPaymentURL", "web payment URL", url) ?? dataLicenses(json) ?? children(json, "chargingStations", "chargingStationIds", "charging stations", chargingStation) ?? (get(json, "gridConnectionPoint") !== void 0 ? `The grid connection point of the charging pool '${id.text}' is embedded in its grid operator: name it by 'gridConnectionPointId'!` : void 0) ?? textError(json, "gridConnectionPointId", "grid connection point identification", nonEmpty) ?? energyMeters(json) ?? brands(json) ?? object(json, "openingTimes", "opening times", openingTimes) ?? object(json, "energyMix", "energy mix", energyMix) ?? objects2(json, "images", "images", image) ?? poolLists(json) ?? optionalBoolean(json, "chargingWhenClosed", "charging when closed") ?? errorOf(ids(json, "templateIds", "template identification", poolTemplateId)) ?? metadata(json);
   if (error !== void 0)
     return error;
   const of = `the charging pool '${id.text}'`;
   const stations = objectsOf3(get(json, "chargingStations"));
   const operator = id.text.slice(0, 6);
-  raise(givenTwice2(idsAt(json, "templateIds", poolTemplateId), `A template of ${of}`));
+  raise(givenTwice2(idsAt(json, "templateIds", poolTemplateId), `template of ${of}`));
   for (const station of stations) {
     const stationOf = idOf3(station, stationId);
     if (stationOf !== void 0 && stationOf.text.slice(0, 6) !== operator)
@@ -6864,7 +6906,7 @@ var chargingPoolTemplate = (json) => caught("a charging pool template", () => {
   const id = header(json, "charging pool template identification", poolTemplateId, "chargingPoolTemplate", "charging pool template");
   if (id instanceof Refused)
     return id.error;
-  const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? textError(json, "chargingTariffId", "charging tariff identification", tariffId) ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? textError(json, "parkingType", "parking type", nonEmpty) ?? textError(json, "accessibility", "accessibility", nonEmpty) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? dataLicenses(json) ?? textError(json, "gridConnectionPointId", "grid connection point identification", nonEmpty) ?? brands(json) ?? object(json, "openingTimes", "opening times", openingTimes) ?? object(json, "energyMix", "energy mix", energyMix) ?? objects2(json, "images", "images", image) ?? poolLists(json) ?? optionalBoolean(json, "chargingWhenClosed", "charging when closed") ?? metadata(json);
+  const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? textError(json, "chargingTariffId", "charging tariff identification", tariffId) ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? textError(json, "parkingType", "parking type", nonEmpty) ?? textError(json, "accessibility", "accessibility", nonEmpty) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "webPaymentURL", "web payment URL", url) ?? dataLicenses(json) ?? textError(json, "gridConnectionPointId", "grid connection point identification", nonEmpty) ?? brands(json) ?? object(json, "openingTimes", "opening times", openingTimes) ?? object(json, "energyMix", "energy mix", energyMix) ?? objects2(json, "images", "images", image) ?? poolLists(json) ?? optionalBoolean(json, "chargingWhenClosed", "charging when closed") ?? metadata(json);
   if (error !== void 0)
     return error;
   const of = `the charging pool template '${id.text}'`;
@@ -6914,12 +6956,12 @@ function priceComponent(json) {
   if (stepSize instanceof Refused)
     return stepSize.error;
   if (price !== void 0 && price.mantissa < 0n)
-    return `The price of a ${asText(type)} price component must not be negative!`;
+    return `The price of ${withArticle(`${asText(type)} price component`, false)} must not be negative!`;
   if (vat !== void 0 && (vat.mantissa < 0n || vat.compareTo(new Decimal(100n, 0)) > 0))
-    return `The VAT of a ${asText(type)} price component must be between 0 and 100 percent!`;
+    return `The VAT of ${withArticle(`${asText(type)} price component`, false)} must be between 0 and 100 percent!`;
   if (type === "FLAT")
     return isGiven3(get(json, "stepSize")) ? "A FLAT price component has no step size!" : void 0;
-  return stepSize === void 0 || signOf(stepSize) <= 0 ? `A ${asText(type)} price component needs a positive step size!` : void 0;
+  return stepSize === void 0 || signOf(stepSize) <= 0 ? `${withArticle(`${asText(type)} price component`)} needs a positive step size!` : void 0;
 }
 function exactTime(given2, format) {
   if (format === "HH:mm") {
@@ -7066,9 +7108,9 @@ var tariff = (template) => (json) => caught(template ? "a charging tariff templa
   if (error !== void 0)
     return error;
   if (!template)
-    raise(givenTwice2(idsAt(json, "templateIds", tariffTemplateId), `A template of the ${of}`));
-  raise(givenTwice2(namesAt(json, "paymentMeans"), `A payment means of the ${of}`));
-  raise(givenTwice2(namesAt(json, "paymentBrands"), `A payment brand of the ${of}`));
+    raise(givenTwice2(idsAt(json, "templateIds", tariffTemplateId), `template of the ${of}`));
+  raise(givenTwice2(namesAt(json, "paymentMeans"), `payment means of the ${of}`));
+  raise(givenTwice2(namesAt(json, "paymentBrands"), `payment brand of the ${of}`));
   return void 0;
 });
 var chargingTariff = tariff(false);
@@ -7095,7 +7137,7 @@ function discount(json) {
     return error;
   const value = percent instanceof Decimal ? percent : new Decimal(BigInt(percent), 0);
   if (value.mantissa <= 0n || value.compareTo(new Decimal(100n, 0)) > 0)
-    return `The percentage of a discount must be above 0 and at most 100, not ${value.toString()}! (Parameter 'Percent')`;
+    return `The percentage of a discount must be above 0 and at most 100, not ${numberText(value)}! (Parameter 'Percent')`;
   const dimensions = idsByName(json, "dimensions", "", []);
   return new Set(dimensions).size !== dimensions.length ? "A dimension of a discount must not be given twice! (Parameter 'Dimensions')" : void 0;
 }
@@ -7114,11 +7156,11 @@ var chargingTariffOffer = (json) => caught("a charging tariff offer", () => {
     return error;
   if (price === void 0 === (reduction === void 0))
     throw thrown(`The charging tariff offer '${id.text}' must have exactly one of a price of its own and a discount!`, "ChargingTariff");
-  raise(givenTwice2(idsAt(json, "EVSEGroupIds", evseGroupId), `A EVSE group of ${owner}`));
-  raise(givenTwice2(idsAt(json, "chargingStationGroupIds", stationGroupId), `A charging station group of ${owner}`));
-  raise(givenTwice2(idsAt(json, "chargingPoolGroupIds", poolGroupId), `A charging pool group of ${owner}`));
-  raise(givenTwice2(idsAt(json, "chargingStationOperatorIds", operatorId), `A charging station operator of ${owner}`));
-  raise(givenTwice2(idsAt(json, "eMobilityProviderIds", providerId), `A e-mobility provider of ${owner}`));
+  raise(givenTwice2(idsAt(json, "EVSEGroupIds", evseGroupId), `EVSE group of ${owner}`));
+  raise(givenTwice2(idsAt(json, "chargingStationGroupIds", stationGroupId), `charging station group of ${owner}`));
+  raise(givenTwice2(idsAt(json, "chargingPoolGroupIds", poolGroupId), `charging pool group of ${owner}`));
+  raise(givenTwice2(idsAt(json, "chargingStationOperatorIds", operatorId), `charging station operator of ${owner}`));
+  raise(givenTwice2(idsAt(json, "eMobilityProviderIds", providerId), `e-mobility provider of ${owner}`));
   if (["EVSEGroupIds", "chargingStationGroupIds", "chargingPoolGroupIds", "chargingStationOperatorIds"].every((property) => idsAt(json, property, freeId).length === 0))
     throw thrown(`The charging tariff offer '${id.text}' must name at least one EVSE group, charging station group, charging pool group or charging station operator!`, "EVSEGroupIds");
   if (typeof notBefore === "number" && typeof notAfter === "number" && notAfter < notBefore)
@@ -7134,20 +7176,20 @@ var parkingSpace = (json) => caught("a parking space", () => {
   if (error !== void 0)
     return error;
   const of = `the parking space '${id.text}'`;
-  raise(givenTwice2(idsAt(json, "templateIds", freeId), `A template of ${of}`));
-  raise(givenTwice2(idsAt(json, "parkingSensorIds", freeId), `A parking sensor of ${of}`));
-  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `A charging station of ${of}`));
-  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `A parking product of ${of}`));
-  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `A parking restriction of ${of}`));
-  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `A EU vehicle category of ${of}`));
+  raise(givenTwice2(idsAt(json, "templateIds", freeId), `template of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingSensorIds", freeId), `parking sensor of ${of}`));
+  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `charging station of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `parking product of ${of}`));
+  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `parking restriction of ${of}`));
+  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `EU vehicle category of ${of}`));
   if (notPositive(json, "maxVehicleWeight"))
     throw thrown(`The maximum vehicle weight of ${of} must be positive!`, "MaxVehicleWeight");
   for (const property of dimensions)
     if (notPositive(json, property))
       throw thrown(`The ${property} of ${of} must be positive!`, property.charAt(0).toUpperCase() + property.slice(1));
-  raise(givenTwice2(namesAt(json, "vehicleTypes"), `A vehicle type of ${of}`));
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
+  raise(givenTwice2(namesAt(json, "vehicleTypes"), `vehicle type of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
   return void 0;
 });
 var notPositive = (json, property) => {
@@ -7167,14 +7209,14 @@ var parkingSpaceTemplate = (json) => caught("a parking space template", () => {
   const of = `the parking space template '${id.text}'`;
   if (["maxVehicleWeight", ...dimensions].some((property) => notPositive(json, property)))
     throw thrown(`The vehicle limits and dimensions of ${of} must be positive!`);
-  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `A parking product of ${of}`));
-  raise(givenTwice2(idsAt(json, "parkingSensorIds", freeId), `A parking sensor of ${of}`));
-  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `A charging station of ${of}`));
-  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `A parking restriction of ${of}`));
-  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `A EU vehicle category of ${of}`));
-  raise(givenTwice2(namesAt(json, "vehicleTypes"), `A vehicle type of ${of}`));
-  raise(givenTwice2(namesAt(json, "standards"), `A standard of ${of}`));
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `parking product of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingSensorIds", freeId), `parking sensor of ${of}`));
+  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `charging station of ${of}`));
+  raise(givenTwice2(namesAt(json, "parkingRestrictions"), `parking restriction of ${of}`));
+  raise(givenTwice2(namesAt(json, "euVehicleCategories"), `EU vehicle category of ${of}`));
+  raise(givenTwice2(namesAt(json, "vehicleTypes"), `vehicle type of ${of}`));
+  raise(givenTwice2(namesAt(json, "standards"), `standard of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
   return void 0;
 });
 var parkingGarage = (json) => caught("a parking garage", () => {
@@ -7185,9 +7227,9 @@ var parkingGarage = (json) => caught("a parking garage", () => {
   if (error !== void 0)
     return error;
   const of = `the parking garage '${id.text}'`;
-  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `A charging station of ${of}`));
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `A parking product of ${of}`));
+  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `charging station of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(idsAt(json, "parkingProductIds", caseId), `parking product of ${of}`));
   return void 0;
 });
 var parkingSensor = (json) => caught("a parking sensor", () => {
@@ -7197,7 +7239,7 @@ var parkingSensor = (json) => caught("a parking sensor", () => {
   const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? geoLocationError(json, "geoLocation", "geo location") ?? errorOf(ids(json, "chargingStationIds", "charging station identification", stationId)) ?? metadata(json);
   if (error !== void 0)
     return error;
-  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `A charging station of the parking sensor '${id.text}'`));
+  raise(givenTwice2(idsAt(json, "chargingStationIds", stationId), `charging station of the parking sensor '${id.text}'`));
   return void 0;
 });
 var parkingSpaceGroup = (json) => caught("a parking space group", () => {
@@ -7207,7 +7249,7 @@ var parkingSpaceGroup = (json) => caught("a parking space group", () => {
   const error = i18n(json, "name") ?? i18n(json, "description") ?? text(json, "dataSource", "data source") ?? errorOf(ids(json, "parkingSpaceIds", "member identification", freeId)) ?? metadata(json);
   if (error !== void 0)
     return error;
-  raise(givenTwice2(idsAt(json, "parkingSpaceIds", freeId), `A member of the parking space group '${id.text}'`));
+  raise(givenTwice2(idsAt(json, "parkingSpaceIds", freeId), `member of the parking space group '${id.text}'`));
   return void 0;
 });
 var parkingProduct = (json) => caught("a parking product", () => {
@@ -7272,8 +7314,8 @@ var model = (meter) => (json) => caught(meter ? "an energy meter model" : "a cha
   const versions = versionTwice(json, of);
   if (versions !== void 0)
     throw new Thrown(versions);
-  raise(givenTwice2(imagesAt(json), `An image of ${of}`));
-  raise(givenTwice2(namesAt(json, meter ? "signatureMethods" : "connectorTypes"), `A ${meter ? "signature method" : "connector type"} of ${of}`));
+  raise(givenTwice2(imagesAt(json), `image of ${of}`));
+  raise(givenTwice2(namesAt(json, meter ? "signatureMethods" : "connectorTypes"), `${meter ? "signature method" : "connector type"} of ${of}`));
   return void 0;
 });
 var manufacturer = (meter) => (json) => caught(meter ? "an energy meter manufacturer" : "a charging station manufacturer", () => {
@@ -7465,7 +7507,7 @@ var gridConnectionPoint = (json) => caught("a grid connection point", () => {
     return error;
   const of = `the grid connection point '${id.text}'`;
   if (isObject(by2) && by2["entityType"] !== "ChargingStationOperator" && by2["entityType"] !== "ParkingOperator")
-    throw thrown(`The grid connection point '${id.text}' can only be maintained by its grid operator, a charging station operator or a parking operator, not by ${partyText(by2)}!`);
+    throw thrown(`Besides its grid operator, the grid connection point '${id.text}' can only be maintained by a charging station operator or a parking operator, not by ${partyText(by2)}!`);
   if (["nominalVoltage", "nominalFrequency"].some((property) => notPositive(json, property)))
     throw thrown(`The nominal voltage and frequency of ${of} must be positive!`);
   const contracted = powers.map(([property]) => optionalDecimal2(json, property, property));
@@ -7579,7 +7621,7 @@ var chargingStationOperator = (of) => (json) => caught("a charging station opera
   if (id instanceof Refused)
     return id.error;
   const merchant = get(json, "evTaler");
-  const error = i18n(json, "name") ?? i18n(json, "description") ?? styxText(json, "dataSource", "data source") ?? dataLicenses(json) ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? operatorLogos(json) ?? textError(json, "telephone", "telephone number", phoneNumber) ?? eMailAddressError(json, "eMailAddress", "e-mail address") ?? textError(json, "homepage", "homepage", url) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "termsAndConditions", "terms and conditions URL", url) ?? (merchant === void 0 ? void 0 : (() => {
+  const error = i18n(json, "name") ?? i18n(json, "description") ?? styxText(json, "dataSource", "data source") ?? dataLicenses(json) ?? addressError(json, "address", "address") ?? geoLocationError(json, "geoLocation", "geo location") ?? operatorLogos(json) ?? textError(json, "telephone", "telephone number", phoneNumber) ?? eMailAddressError(json, "eMailAddress", "e-mail address") ?? textError(json, "homepage", "homepage", url) ?? textError(json, "hotline", "hotline phone number", phoneNumber) ?? textError(json, "termsAndConditions", "terms and conditions URL", url) ?? textError(json, "webPaymentURL", "web payment URL", url) ?? (merchant === void 0 ? void 0 : (() => {
     const read = evTalerMerchantOf(merchant);
     return typeof read === "string" ? read : void 0;
   })()) ?? children(json, "chargingPools", "chargingPoolIds", "charging pools", chargingPool) ?? children(json, "EVSEGroups", "EVSEGroupIds", "EVSEGroups", group(EVSE_GROUP)) ?? children(json, "chargingStationGroups", "chargingStationGroupIds", "ChargingStationGroups", group(CHARGING_STATION_GROUP)) ?? children(json, "chargingPoolGroups", "chargingPoolGroupIds", "ChargingPoolGroups", group(CHARGING_POOL_GROUP)) ?? children(json, "chargingTariffGroups", "chargingTariffGroupIds", "ChargingTariffGroups", group(CHARGING_TARIFF_GROUP)) ?? energyMeterGroups(json) ?? children(json, "EVSETemplates", "EVSETemplateIds", "EVSE templates", evseTemplate) ?? children(json, "chargingStationTemplates", "chargingStationTemplateIds", "charging station templates", chargingStationTemplate) ?? children(json, "chargingPoolTemplates", "chargingPoolTemplateIds", "charging pool templates", chargingPoolTemplate) ?? children(json, "chargingTariffTemplates", "chargingTariffTemplateIds", "charging tariff templates", chargingTariffTemplate) ?? energyMeterTemplates(json) ?? children(json, "parkingSpaces", "parkingSpaceIds", "parking spaces", parkingSpace) ?? children(json, "chargingTariffOffers", "chargingTariffOfferIds", "charging tariff offers", chargingTariffOffer) ?? children(json, "brands", "brandIds", "brands", brand) ?? children(json, "chargingTariffs", "chargingTariffIds", "charging tariffs", chargingTariff) ?? keysError(json) ?? metadata(json);
@@ -7628,6 +7670,37 @@ function invalidReading(content, of = "version") {
     throw e;
   }
 }
+var PARTY_READERS = {
+  ChargingStationManufacturer: manufacturer(false),
+  EMobilityProvider: eMobilityProvider,
+  GridOperator: gridOperator,
+  ParkingOperator: parkingOperator,
+  TransparencySoftwareManufacturer: softwareManufacturer,
+  ConformityAssessmentBody: conformityAssessmentBody,
+  EnergyMeterManufacturer: manufacturer(true),
+  ChargingStationOperator: chargingStationOperator("change set")
+};
+function invalidParty(type, json) {
+  try {
+    return PARTY_READERS[type]?.(json);
+  } catch (e) {
+    if (e instanceof Thrown)
+      return `The given JSON representation of a roaming network is invalid: ${e.message}`;
+    throw e;
+  }
+}
+function invalidTreeHashAlgorithms(value) {
+  if (!isArray(value))
+    return "The 'treeHashAlgorithms' must be a JSON array of hash algorithms!";
+  const unknown = value.find((algorithm) => !isHashAlgorithm(algorithm));
+  if (unknown !== void 0)
+    return `Unknown tree hash algorithm '${asText(unknown)}': sha256, sha384 or sha512!`;
+  if (value.length === 0)
+    return "The 'treeHashAlgorithms' must name at least one hash algorithm!";
+  if (new Set(value).size !== value.length)
+    return "The 'treeHashAlgorithms' must not name a hash algorithm twice!";
+  return void 0;
+}
 
 // src/network/writtenForm.ts
 var idOf4 = (value) => isObject(value) && typeof value["@id"] === "string" ? value["@id"] : "";
@@ -7666,6 +7739,7 @@ var ORDERED_TEXTS = /* @__PURE__ */ new Set([
   "verifiedTransparencySoftwareIds",
   "compatibleTransparencySoftwareIds",
   "cardTypes",
+  "channels",
   "dimensions",
   "usages"
 ]);
@@ -7676,6 +7750,7 @@ var LEFT_OUT_WHEN_EMPTY = /* @__PURE__ */ new Set([
   "cardTypes",
   "certificateIds",
   "certificates",
+  "channels",
   "chargingConnectors",
   "chargingPoolGroupIds",
   "chargingPoolGroups",
@@ -7757,8 +7832,13 @@ var LEFT_OUT_WHEN_EMPTY = /* @__PURE__ */ new Set([
   "vehicleTypes",
   "regularOpenings",
   "exceptionalOpenings",
-  "exceptionalClosings"
+  "exceptionalClosings",
+  "dataLicenses"
 ]);
+var FLAGS = {
+  currentTypes: ["AC_OnePhase", "AC_ThreePhases", "DC"],
+  chargingModes: ["Mode_1", "Mode_2", "Mode_3", "Mode_4", "CHAdeMO"]
+};
 var LEFT_OUT_WHEN_EMPTY_TEXT = {
   "": ["dataSource"],
   chargingStationOperators: ["dataSource"],
@@ -7886,7 +7966,8 @@ var ENTITY_PROPERTIES = {
     "stackTrace",
     "telephone",
     "termsAndConditions",
-    "uri"
+    "uri",
+    "webPaymentURL"
   ],
   "eMobilityProviders": [
     "@context",
@@ -8191,7 +8272,8 @@ var ENTITY_PROPERTIES = {
     "standards",
     "templateIds",
     "timeZone",
-    "uiFeatures"
+    "uiFeatures",
+    "webPaymentURL"
   ],
   "chargingPoolTemplates": [
     "@context",
@@ -8234,7 +8316,8 @@ var ENTITY_PROPERTIES = {
     "services",
     "standards",
     "timeZone",
-    "uiFeatures"
+    "uiFeatures",
+    "webPaymentURL"
   ],
   "chargingPoolGroups": [
     "@context",
@@ -8286,7 +8369,8 @@ var ENTITY_PROPERTIES = {
     "signatureMethods",
     "templateIds",
     "transparencySoftwareStatus",
-    "vehicleTypes"
+    "vehicleTypes",
+    "webPaymentURL"
   ],
   "chargingStationTemplates": [
     "@context",
@@ -8321,7 +8405,8 @@ var ENTITY_PROPERTIES = {
     "physicalReference",
     "signatureMethods",
     "transparencySoftwareStatus",
-    "vehicleTypes"
+    "vehicleTypes",
+    "webPaymentURL"
   ],
   "chargingStationGroups": [
     "@context",
@@ -8656,7 +8741,7 @@ var PROPERTIES_OF = {
   keyStatement: ["@context", "roamingNetworkId", "roamingNetworkOperatorId", "identityKeys", "minConsensus", "signedAt", "validUntil", "signatures"],
   signatures: ["algorithm", "keyId", "value"],
   signingKeyCertificates: ["@context", "roamingNetworkOperatorId", "signingKey", "signedAt", "algorithm", "keyId", "value"],
-  evTaler: ["@context", "merchantBaseURL", "merchantPublicKey", "exchanges"],
+  evTaler: ["@context", "merchantBaseURL", "merchantPublicKey", "exchanges", "offersURL"],
   exchanges: ["@context", "masterPublicKey", "baseURL", "currency", "name"]
 };
 var PROPERTY_SETS = new Map(Object.entries(PROPERTIES_OF).map(([kind, properties]) => [kind, new Set(properties)]));
@@ -8669,6 +8754,7 @@ var TRIMMED = /* @__PURE__ */ new Set([
   "transparencySoftwareId",
   "version",
   "vulnerabilityContact",
+  "hotline",
   "energyMeterManufacturerId",
   "energyMeterModel",
   "roamingNetworkId",
@@ -8757,8 +8843,8 @@ function writtenText(property, text2) {
     return LANGUAGES.has(text2.toLowerCase()) ? text2.toLowerCase() : text2;
   if (property === "exceptionalOpenings" || property === "exceptionalClosings")
     return periodOf(text2) ?? text2;
-  const names = NAMED_VALUES[property];
-  return names?.find((name) => name.toLowerCase() === trimmed(text2).toLowerCase()) ?? trimmed(text2);
+  const names2 = NAMED_VALUES[property];
+  return names2?.find((name) => name.toLowerCase() === trimmed(text2).toLowerCase()) ?? trimmed(text2);
 }
 function writtenTexts(items, property) {
   const texts3 = items.map((item) => typeof item === "string" ? writtenText(property, item) : void 0);
@@ -8767,7 +8853,16 @@ function writtenTexts(items, property) {
   const written2 = texts3;
   return ORDERED_TEXTS.has(property) ? [...written2].sort(ordinal) : written2;
 }
-var URLS = /* @__PURE__ */ new Set(["homepage", "datasheetURL", "vulnerabilityReporting", "vulnerabilityDisclosurePolicy", "securityAdvisories", "merchantBaseURL", "baseURL"]);
+var URLS = /* @__PURE__ */ new Set([
+  "homepage",
+  "datasheetURL",
+  "vulnerabilityReporting",
+  "vulnerabilityDisclosurePolicy",
+  "securityAdvisories",
+  "merchantBaseURL",
+  "baseURL",
+  "offersURL"
+]);
 var NAMED_VALUES = {
   role: ["battery", "evse", "grid", "gridConnectionPoint", "pool", "pv", "station", "wind"],
   legalStatus: ["forInformationOnly", "germanCalibrationLaw", "verified"],
@@ -8787,13 +8882,26 @@ function orderKeys(items, property) {
     return items.map((item) => isObject(item) ? asText(item["masterPublicKey"]) : "");
   if (property === "daysOfWeek")
     return items.map((item) => String(DAYS_OF_WEEK2.indexOf(typeof item === "string" ? item : "")).padStart(2, "0"));
+  const flags2 = property === void 0 ? void 0 : FLAGS[property];
+  if (flags2 !== void 0)
+    return items.map((item) => String(flags2.indexOf(typeof item === "string" ? item : "")).padStart(2, "0"));
   if (items.length > 0 && items.every((item) => isObject(item) && typeof item["@id"] === "string"))
     return items.map(idOf4);
   if (property !== void 0 && ORDERED_TEXTS.has(property) && items.every((item) => typeof item === "string"))
     return items.map((item) => typeof item === "string" ? item : "");
   return void 0;
 }
-var languagesOf2 = (text2) => [...new Set(Object.entries(text2).filter(([, value]) => typeof value === "string").map(([language]) => LANGUAGES.has(language.toLowerCase()) ? language.toLowerCase() : /^\d+$/u.test(language) && Number(language) < LANGUAGES.size ? `(language ${language})` : /^[+-]?\d+$/u.test(language) ? language : void 0).filter((language) => language !== void 0))];
+var LANGUAGE_NAMES = [...LANGUAGES];
+function languageOf(language) {
+  if (LANGUAGES.has(language.toLowerCase()))
+    return language.toLowerCase();
+  if (!/^[+-]?\d+$/u.test(language))
+    return void 0;
+  const number = Number(language);
+  return number >= 0 && number < LANGUAGE_NAMES.length ? LANGUAGE_NAMES[number] : String(number);
+}
+var textsOf2 = (text2) => Object.fromEntries(Object.entries(text2).filter(([, value]) => typeof value === "string").map(([language, value]) => [languageOf(language), value]).filter((entry) => entry[0] !== void 0));
+var languagesOf2 = (text2) => Object.keys(textsOf2(text2));
 function writtenValueOf(property, value, holder) {
   if ((property === "@id" || property === "type" && holder === "chargingConnectors") && (typeof value === "number" || typeof value === "boolean"))
     return String(value);
@@ -8806,9 +8914,9 @@ function writtenValueOf(property, value, holder) {
       return trimmed(value);
     if (URLS.has(property))
       return hermodURL(value)?.text;
-    const names = NAMED_VALUES[property];
-    if (names !== void 0)
-      return names.find((name) => name.toLowerCase() === trimmed(value).toLowerCase()) ?? trimmed(value);
+    const names2 = NAMED_VALUES[property];
+    if (names2 !== void 0)
+      return names2.find((name) => name.toLowerCase() === trimmed(value).toLowerCase()) ?? trimmed(value);
   }
   if (holder === "geoLocation" && (property === "lat" || property === "lng" || property === "alt")) {
     const number = isNumber(value) ? Number(canonicalJSON(value)) : typeof value === "string" || typeof value === "boolean" ? doubleOf(value) : void 0;
@@ -8838,7 +8946,7 @@ function writtenValueOf(property, value, holder) {
     return valueText(value) ?? void 0;
   return void 0;
 }
-var contentText = (value) => typeof value === "number" && !Number.isSafeInteger(value) ? String(value) : canonicalJSON(value);
+var contentText = (value) => value === void 0 ? "absent" : typeof value === "number" && !Number.isSafeInteger(value) ? String(value) : canonicalJSON(value);
 function asRead(value, kind) {
   if (isArray(value))
     return value.map((element) => asRead(element, kind));
@@ -8847,10 +8955,23 @@ function asRead(value, kind) {
   const known = PROPERTIES_OF[kind];
   return Object.fromEntries(Object.entries(value).filter(([key2]) => known === void 0 || known.includes(key2)).map(([key2, element]) => [key2, PROPERTIES_OF[key2] === void 0 ? element : asRead(element, key2)]));
 }
+function heldNumber(value) {
+  if (typeof value !== "number" || Number.isSafeInteger(value))
+    return value;
+  try {
+    return Decimal.parse(String(value));
+  } catch {
+    return void 0;
+  }
+}
 function notWritten(value, property, path, of) {
   const eachOnce = of === "new value";
   const join2 = (at, key2) => at === "" ? key2 : `${at}.${key2}`;
-  const holdsAs = (at, written2) => ({ path: at, reason: `the content holds it as '${contentText(written2)}'` });
+  const heldAt = (place, held) => ({ at: place, value: held });
+  const holdsAs = (at, place, written2) => {
+    const held = heldNumber(written2);
+    return { path: at, reason: `the content holds it as '${contentText(written2)}'`, ...held === void 0 ? {} : { held: heldAt(place, held) } };
+  };
   const leftOut = (key2, element, kind, keepsEmptyName) => {
     if (element === null)
       return "a property without a value is left out";
@@ -8869,22 +8990,53 @@ function notWritten(value, property, path, of) {
       return "the content leaves it out";
     return void 0;
   };
-  const check2 = (item, name, holder, at, root = false) => {
+  const writtenOtherwise = (key2, element, kind, at, place) => {
+    if (typeof element === "string" && TIMESTAMP_PROPERTIES.has(key2) && !TIMESTAMP4.test(element)) {
+      const time = timestampOf(element);
+      return {
+        path: at,
+        reason: "a timestamp is UTC to the millisecond, yyyy-MM-ddTHH:mm:ss.fffZ",
+        ...time === void 0 ? {} : { held: heldAt(place, toTimestamp(time)) }
+      };
+    }
+    const written2 = key2 === "customData" ? void 0 : writtenValueOf(key2, element, kind);
+    if (written2 !== void 0 && (typeof written2 === "string" && typeof element === "string" ? written2 !== element : contentText(written2) !== contentText(element)))
+      return holdsAs(at, place, written2);
+    return void 0;
+  };
+  const check2 = (item, name, holder, at, place, root = false) => {
     if (name === "customData")
       return void 0;
     if (isArray(item)) {
       const written2 = name === void 0 ? void 0 : writtenTexts(item, name);
       const differs = written2?.findIndex((text2, index) => text2 !== item[index]) ?? -1;
       if (written2 !== void 0 && differs >= 0)
-        return holdsAs(`${at}[${String(differs)}]`, written2[differs] ?? "");
+        return { ...holdsAs(`${at}[${String(differs)}]`, place, written2[differs] ?? ""), held: heldAt(place, written2) };
       if (name !== void 0 && ORDERED_TEXTS.has(name) && item.some((element) => typeof element === "string" && trimmed(element) !== element))
-        return { path: at, reason: "the texts of its elements are trimmed" };
+        return {
+          path: at,
+          reason: "the texts of its elements are trimmed",
+          held: heldAt(place, item.map((element) => typeof element === "string" ? trimmed(element) : element))
+        };
       const keys = orderKeys(item, name);
-      if (keys?.some((key2, index) => index > 0 && ordinal(keys[index - 1] ?? "", key2) >= (eachOnce ? 0 : 1)) === true)
-        return { path: at, reason: eachOnce ? "its elements are in the order the content holds them in, each once" : "its elements are in the order the content holds them in" };
+      if (keys?.some((key2, index) => index > 0 && ordinal(keys[index - 1] ?? "", key2) >= (eachOnce ? 0 : 1)) === true) {
+        const seen = /* @__PURE__ */ new Set();
+        const firsts = ({ key: key2 }) => {
+          if (seen.has(key2))
+            return false;
+          seen.add(key2);
+          return true;
+        };
+        const ordered2 = keys.map((key2, index) => ({ key: key2, index })).sort((left, right) => ordinal(left.key, right.key) || left.index - right.index).filter((entry) => !eachOnce || firsts(entry)).map(({ index }) => item[index] ?? null);
+        return {
+          path: at,
+          reason: eachOnce ? "its elements are in the order the content holds them in, each once" : "its elements are in the order the content holds them in",
+          held: heldAt(place, ordered2)
+        };
+      }
       for (const [index, element] of item.entries()) {
         const elementAt = `${at}[${String(index)}]`;
-        const found = check2(element, void 0, name, elementAt);
+        const found = check2(element, void 0, name, elementAt, [...place, index]);
         if (found !== void 0)
           return found;
       }
@@ -8895,44 +9047,75 @@ function notWritten(value, property, path, of) {
       const party = name === void 0 && holder !== void 0 ? PARTY_NAMES[holder] : void 0;
       const keepsEmptyName = name === void 0 && holder === "chargingStationOperators";
       if (name !== void 0 && TEXTS_IN_LANGUAGES.has(name) && [...Object.keys(item)].sort(ordinal).join("\0") !== languagesOf2(item).sort(ordinal).join("\0"))
-        return { path: at, reason: "a text in languages names each language as Styx writes it, in lower case, with a text" };
+        return {
+          path: at,
+          reason: "a text in languages names each language as Styx writes it, in lower case, with a text",
+          held: heldAt(place, textsOf2(item))
+        };
       for (const [key2, element] of Object.entries(item)) {
         if (key2 === "@context") {
           if (root)
             continue;
-          return { path: at, reason: "embedded, an object names no JSON-LD context" };
+          return { path: at, reason: "embedded, an object names no JSON-LD context", held: heldAt([...place, key2], void 0) };
         }
         const elementAt = join2(at, key2);
+        const elementPlace = [...place, key2];
         const omitted2 = leftOut(key2, element, kind, keepsEmptyName);
         if (omitted2 !== void 0)
-          return { path: elementAt, reason: omitted2 };
-        if (typeof element === "string" && TIMESTAMP_PROPERTIES.has(key2) && !TIMESTAMP4.test(element))
-          return { path: elementAt, reason: "a timestamp is UTC to the millisecond, yyyy-MM-ddTHH:mm:ss.fffZ" };
-        const written2 = key2 === "customData" ? void 0 : writtenValueOf(key2, element, kind);
-        if (written2 !== void 0 && (typeof written2 === "string" && typeof element === "string" ? written2 !== element : contentText(written2) !== contentText(element)))
-          return holdsAs(elementAt, written2);
-        const found = check2(element, key2, kind, elementAt);
+          return { path: elementAt, reason: omitted2, held: heldAt(elementPlace, void 0) };
+        const found = writtenOtherwise(key2, element, kind, elementAt, elementPlace) ?? check2(element, key2, kind, elementAt, elementPlace);
         if (found !== void 0)
           return found;
       }
       if (party !== void 0 && !("name" in item))
-        return holdsAs(join2(at, "name"), { en: `${party} '${asText(writtenValueOf("@id", item["@id"] ?? "", holder) ?? item["@id"])}'` });
+        return holdsAs(join2(at, "name"), [...place, "name"], { en: `${party} '${asText(writtenValueOf("@id", item["@id"] ?? "", holder) ?? item["@id"])}'` });
       for (const list of name === void 0 && holder !== void 0 ? WRITTEN_ALSO_EMPTY[holder] ?? [] : [])
         if (!(list in item))
-          return holdsAs(join2(at, list), []);
+          return holdsAs(join2(at, list), [...place, list], []);
       if (!eachOnce && typeof item["created"] === "string" && !("lastChange" in item))
-        return holdsAs(join2(at, "lastChange"), item["created"]);
+        return holdsAs(join2(at, "lastChange"), [...place, "lastChange"], item["created"]);
       if (kind === "openingTimes" && !("24/7" in item)) {
         const regular = item["regularOpenings"];
-        return holdsAs(join2(at, "24/7"), !(isArray(regular) && regular.length > 0));
+        return holdsAs(join2(at, "24/7"), [...place, "24/7"], !(isArray(regular) && regular.length > 0));
       }
     }
     return void 0;
   };
   const omitted = property === void 0 ? void 0 : leftOut(property, value, void 0, false);
   if (omitted !== void 0)
-    return { path, reason: omitted };
-  return check2(value, property, void 0, path, of === "version" && property === void 0);
+    return { path, reason: omitted, held: heldAt([], void 0) };
+  return (property === void 0 ? void 0 : writtenOtherwise(property, value, void 0, path, [])) ?? check2(value, property, void 0, path, [], of === "version" && property === void 0);
+}
+function heldAs(value, property) {
+  let held = clone(value);
+  for (let round = 0; round < 1e3; round++) {
+    const found = notWritten(held, property, property ?? "", "new value");
+    if (found === void 0)
+      return { value: held };
+    if (found.held === void 0)
+      return void 0;
+    const next = placed(held, found.held.at, found.held.value);
+    if (next === void 0)
+      return { value: void 0 };
+    held = next;
+  }
+  return void 0;
+}
+function placed(value, at, held) {
+  const [first2, ...rest] = at;
+  if (first2 === void 0)
+    return held;
+  if (isArray(value) && typeof first2 === "number") {
+    const element = value[first2];
+    const inner = element === void 0 ? held : placed(element, rest, held);
+    return inner === void 0 ? value.filter((_, index) => index !== first2) : value.map((item, index) => index === first2 ? inner : item);
+  }
+  if (isObject(value) && typeof first2 === "string") {
+    const element = value[first2];
+    const inner = element === void 0 || rest.length === 0 ? held : placed(element, rest, held);
+    return inner === void 0 ? without(value, first2) : { ...value, [first2]: inner };
+  }
+  return value;
 }
 function notWrittenAsHeld(content) {
   const found = notWritten(content, void 0, "", "version");
@@ -9173,13 +9356,17 @@ var KeyStatement = class _KeyStatement {
       return { algorithm, keyId, value: value2 };
     });
     onlyProperties(json, ["@context", "roamingNetworkId", "roamingNetworkOperatorId", "identityKeys", "minConsensus", "signedAt", "validUntil", "signatures"], "A key statement");
+    if (new Set(identityKeys.map((key2) => key2.id)).size !== identityKeys.length)
+      throw new POIError("Invalid key statement: An identity key of a key statement must not be given twice!");
     if (identityKeys.some((key2, index) => {
       const before = identityKeys[index - 1];
       return before !== void 0 && before.id >= key2.id;
     }))
       throw new POIError("The identity keys of a key statement are written in the order of their @ids!");
     if (validUntil < signedAt)
-      throw new POIError("A key statement is not valid until before it was signed!");
+      throw new POIError("Invalid key statement: A key statement is not valid until before it was signed. (Parameter 'ValidUntil')");
+    if (new Set(signatures.map((signature) => signature.keyId)).size !== signatures.length)
+      throw new POIError("Invalid key statement: An identity key signs a key statement once. (Parameter 'Signatures')");
     return new _KeyStatement(roamingNetworkId, roamingNetworkOperatorId, identityKeys, minConsensus, signedAt, validUntil, signatures, json);
   }
   /** The statement as it is signed: without `signatures`, with its `@context`, keys embedded without theirs. */
@@ -9428,12 +9615,12 @@ var RoamingNetworkOperator = class _RoamingNetworkOperator {
     const invalid = (error) => new POIError(`The given JSON representation of a roaming network operator is invalid: ${error}`);
     const certifications = certificates.map((certificate) => `${certificate.signingKey.id}/${certificate.keyId}`);
     if (new Set(certifications).size !== certifications.length)
-      throw invalid(`An certificate of a signing key of the roaming network operator '${id}' must not be given twice!`);
+      throw invalid(`A certificate of a signing key of the roaming network operator '${id}' must not be given twice!`);
     const certified = /* @__PURE__ */ new Map();
     for (const certificate of certificates) {
       const before = certified.get(certificate.signingKey.id);
       if (before !== void 0 && !sameValue(without(before.json, "@context"), without(asRead(certificate.signingKey.json, "signingKey"), "@context")))
-        throw invalid(`An signing key of the roaming network operator '${id}' must not be given twice!`);
+        throw invalid(`A signing key of the roaming network operator '${id}' must not be given twice!`);
       certified.set(certificate.signingKey.id, certificate.signingKey);
     }
     const signingKeys = [...certified.values()];
@@ -9483,6 +9670,18 @@ var RoamingNetworkOperator = class _RoamingNetworkOperator {
     return new _RoamingNetworkOperator(id, identityKeys, minConsensus, keyStatement, certificates, json);
   }
 };
+function invalidRoamingNetworkOperator(json, roamingNetworkId) {
+  try {
+    RoamingNetworkOperator.parse(json, roamingNetworkId);
+    return void 0;
+  } catch (e) {
+    if (e instanceof KeyStatementError)
+      return void 0;
+    if (e instanceof POIError)
+      return e.message;
+    throw e;
+  }
+}
 var RoamingNetwork = class _RoamingNetwork {
   constructor(id, content, operator, treeHashAlgorithms) {
     this.id = id;
@@ -9530,15 +9729,9 @@ var RoamingNetwork = class _RoamingNetwork {
     let treeHashAlgorithms = ["sha256"];
     const treeHashAlgorithmsJSON = get(json, "treeHashAlgorithms");
     if (treeHashAlgorithmsJSON !== void 0) {
-      if (!isArray(treeHashAlgorithmsJSON))
-        throw new POIError("The 'treeHashAlgorithms' must be a JSON array of hash algorithms!");
-      const unknown = treeHashAlgorithmsJSON.find((algorithm) => !isHashAlgorithm(algorithm));
-      if (unknown !== void 0)
-        throw new POIError(`Unknown tree hash algorithm '${asText(unknown)}': sha256, sha384 or sha512!`);
-      if (treeHashAlgorithmsJSON.length === 0)
-        throw new POIError("The 'treeHashAlgorithms' must name at least one hash algorithm!");
-      if (new Set(treeHashAlgorithmsJSON).size !== treeHashAlgorithmsJSON.length)
-        throw new POIError("The 'treeHashAlgorithms' must not name a hash algorithm twice!");
+      const invalid = invalidTreeHashAlgorithms(treeHashAlgorithmsJSON);
+      if (invalid !== void 0)
+        throw new POIError(invalid);
       treeHashAlgorithms = treeHashAlgorithmsJSON;
     }
     if (get(json, "signingKeys") !== void 0 || get(json, "identityKeys") !== void 0)
@@ -10693,10 +10886,10 @@ function parsePreconditions(value) {
     const context2 = get(item, "@context");
     const entityType = get(item, "entityType");
     const entityId2 = get(item, "entityId");
-    if (context2 !== void 0 && context2 !== PRECONDITION_CONTEXT || typeof entityType !== "string" || entityType === "" || typeof entityId2 !== "string" || entityId2 === "")
+    if (context2 !== void 0 && context2 !== PRECONDITION_CONTEXT || typeof entityType !== "string" || typeof entityId2 !== "string")
       throw invalid;
     try {
-      return { entityType, entityId: entityId2, eTag: parseETag(get(item, "eTag"), true) };
+      return { entityType: trimmed(entityType), entityId: trimmed(entityId2), eTag: parseETag(get(item, "eTag"), true) };
     } catch {
       throw invalid;
     }
@@ -10832,12 +11025,119 @@ function brokenPrecondition(content, preconditions) {
 
 // src/history/changeSet.ts
 var CHANGE_SET_CONTEXT = CONTEXT_PREFIX + "roamingNetwork/changeSet/v3";
+var CHANGE_CONTEXT = CONTEXT_PREFIX + "roamingNetwork/change/v1";
 var MERGE_CHANGE_SET_ID_PREFIX = "merge-";
 function changeSetIdentification(json) {
-  const content = without(json, "@id", "signatures");
+  const content = without(asRead2(json), "@id", "signatures");
   set(content, "@context", CHANGE_SET_CONTEXT);
   return toHex(hash("sha256", canonicalJSONBytes(content)));
 }
+var readTrimmed = (text2) => trimmed(text2) === "" ? text2 : trimmed(text2);
+function asRead2(json) {
+  const copy = { ...json };
+  let changed = false;
+  const networkId = get(json, "roamingNetworkId");
+  if (typeof networkId === "string" && readTrimmed(networkId) !== networkId) {
+    copy["roamingNetworkId"] = readTrimmed(networkId);
+    changed = true;
+  }
+  const description = get(json, "description");
+  if (description === null || isObject(description) && Object.keys(textsOf2(description)).length === 0) {
+    delete copy["description"];
+    changed = true;
+  } else if (isObject(description) && canonicalJSON(textsOf2(description)) !== canonicalJSON(description)) {
+    copy["description"] = textsOf2(description);
+    changed = true;
+  }
+  const metadata2 = get(json, "metadata");
+  if (isObject(metadata2) && Object.keys(metadata2).length === 0) {
+    delete copy["metadata"];
+    changed = true;
+  }
+  const preconditions = get(json, "preconditions");
+  if (isArray(preconditions) && preconditions.length === 0) {
+    delete copy["preconditions"];
+    changed = true;
+  } else if (isArray(preconditions)) {
+    const read = preconditions.map(preconditionAsRead);
+    if (read.some((precondition, index) => precondition !== preconditions[index])) {
+      copy["preconditions"] = read;
+      changed = true;
+    }
+  }
+  const changes = changesAsRead(get(json, "changes"));
+  if (changes !== get(json, "changes")) {
+    copy["changes"] = changes ?? null;
+    changed = true;
+  }
+  return changed ? copy : json;
+}
+var changeSetAsWritten = (json) => asRead2(json);
+function roamingNetworkIdOf(json, id) {
+  const value = get(json, "roamingNetworkId");
+  if (value === void 0)
+    throw new POIError("Missing JSON property 'roamingNetworkId'!");
+  if (value === null || typeof value === "string" && trimmed(value) === "")
+    throw new POIError("Invalid 'roaming network identification'!");
+  return trimmed(requireString(json, "roamingNetworkId", `The roaming network of the change set '${id}'`));
+}
+function preconditionAsRead(precondition) {
+  if (!isObject(precondition))
+    return precondition;
+  const context2 = precondition["@context"];
+  const entityType = precondition["entityType"];
+  const entityId2 = precondition["entityId"];
+  const eTag = precondition["eTag"];
+  if (context2 !== void 0 && context2 !== PRECONDITION_CONTEXT || typeof entityType !== "string" || typeof entityId2 !== "string" || eTag === void 0)
+    return precondition;
+  try {
+    parseETag(eTag, true);
+  } catch {
+    return precondition;
+  }
+  const read = { entityType: trimmed(entityType), entityId: trimmed(entityId2), eTag };
+  return Object.keys(precondition).length === 3 && read["entityType"] === entityType && read["entityId"] === entityId2 ? precondition : read;
+}
+function changesAsRead(changes) {
+  if (!isArray(changes))
+    return changes;
+  const read = changes.map((change) => {
+    if (!isObject(change))
+      return change;
+    const copy = { ...change };
+    let changed = false;
+    for (const property of ["kind", "entityType", "entityId"]) {
+      const value = change[property];
+      if (typeof value === "string" && readTrimmed(value) !== value) {
+        copy[property] = readTrimmed(value);
+        changed = true;
+      }
+    }
+    if (change["@context"] === CHANGE_CONTEXT) {
+      delete copy["@context"];
+      changed = true;
+    }
+    const path = change["elementPath"];
+    if (isArray(path) && path.length === 0) {
+      delete copy["elementPath"];
+      changed = true;
+    } else if (isArray(path) && path.some((segment) => isObject(segment) && (segment["@context"] === ELEMENT_PATH_SEGMENT_CONTEXT || typeof segment["propertyName"] === "string" && readTrimmed(segment["propertyName"]) !== segment["propertyName"]))) {
+      copy["elementPath"] = path.map((segment) => {
+        if (!isObject(segment))
+          return segment;
+        const segmentCopy = { ...segment };
+        if (segment["@context"] === ELEMENT_PATH_SEGMENT_CONTEXT)
+          delete segmentCopy["@context"];
+        if (typeof segment["propertyName"] === "string")
+          segmentCopy["propertyName"] = readTrimmed(segment["propertyName"]);
+        return segmentCopy;
+      });
+      changed = true;
+    }
+    return changed ? copy : change;
+  });
+  return read.some((change, index) => change !== changes[index]) ? read : changes;
+}
 function checkRebasedFrom(json, id) {
   const metadata2 = get(json, "metadata");
   const rebasedFrom = isObject(metadata2) ? get(metadata2, "rebasedFrom") : void 0;
@@ -10874,7 +11174,7 @@ function checkRebasedFrom(json, id) {
   });
   const changes = get(json, "changes");
   (isArray(changes) ? changes : []).forEach((change, index) => {
-    if (isObject(change) && get(change, "oldValue") === void 0 && change["kind"] !== "Add" && change["kind"] !== "AddElement")
+    if (isObject(change) && get(change, "oldValue") === void 0 && !["Add", "AddElement"].includes(readTrimmed(asText(change["kind"]))))
       throw new POIError(`Change ${index} of the change set '${id}', which was rebased, has no old value: the rebase may have overwritten a concurrent change!`);
   });
 }
@@ -10907,7 +11207,7 @@ function elementPathSegment(value, index) {
     throw new POIError(`Change ${index}: invalid element path segment: a schema property name is required!`);
   if (elementId !== void 0 && (typeof elementId !== "string" || blank(elementId)))
     throw new POIError(`Change ${index}: invalid element path segment: an element identifier must not be empty!`);
-  return { propertyName, elementId };
+  return { propertyName: trimmed(propertyName), elementId };
 }
 function checkChange(change, index) {
   const refused = (reason) => {
@@ -10917,6 +11217,8 @@ function checkChange(change, index) {
     refused("its entity type and identification must not be empty!");
   if (change.parentEntityType === void 0 !== (change.parentEntityId === void 0))
     refused("parent type and parent identifier must be supplied together!");
+  if (change.parentEntityType !== void 0 && (blank(change.parentEntityType) || blank(change.parentEntityId ?? "")))
+    refused("its parent entity type and identification must not be empty!");
   if (change.newValue === null)
     refused("a new JSON value must not be null; a property is cleared by RemoveProperty!");
   const elementKind = ELEMENT_KINDS.includes(change.kind);
@@ -11002,37 +11304,57 @@ var ChangeSet = class _ChangeSet {
       "signatures"
     ], "A change set");
     const id = requireString(json, "@id", "The identification of a change set");
-    if (!id.startsWith(MERGE_CHANGE_SET_ID_PREFIX)) {
-      const contentId = changeSetIdentification(json);
-      if (id !== contentId)
-        throw new POIError(`The change set '${id}' is not identified by its content, '${contentId}'!`);
-      checkRebasedFrom(json, id);
-    }
+    const roamingNetworkId = roamingNetworkIdOf(json, id);
+    const createdAt = requireTimestamp(json, "createdAt", `The createdAt of the change set '${id}'`);
     const changes = requireArray(get(json, "changes"), `The changes of the change set '${id}'`).map((item, index) => {
       const change = requireObject(item, `Change ${index}`);
       onlyProperties(change, ["@context", "kind", "entityType", "entityId", "propertyName", "oldValue", "newValue", "parentEntityType", "parentEntityId", "elementPath"], `Change ${index}`);
-      const kind = requireString(change, "kind", `The kind of change ${index}`);
+      const refused = (reason) => {
+        throw new POIError(`Change ${index}: ${reason}`);
+      };
+      const context2 = get(change, "@context");
+      if (context2 !== void 0 && context2 !== CHANGE_CONTEXT)
+        refused(`the JSON-LD context of the roaming network change must be '${CHANGE_CONTEXT}'!`);
+      const text2 = (property, description2) => {
+        const value2 = get(change, property);
+        return value2 === void 0 || typeof value2 === "string" ? value2 : refused(`the ${description2} must be a text!`);
+      };
+      const mandatory = (property, description2) => readTrimmed(text2(property, description2) ?? refused(`the ${description2} must be a text!`));
+      const kind = mandatory("kind", "kind");
       if (!KINDS.includes(kind))
-        throw new POIError(`Change ${index}: unknown kind '${kind}'!`);
+        refused(`unknown kind '${trimmed(kind)}'!`);
+      const entityType = mandatory("entityType", "entity type");
+      const entityId2 = mandatory("entityId", "entity identification");
+      const propertyName = text2("propertyName", "property name");
+      const parentEntityType = text2("parentEntityType", "parent entity type");
+      const parentEntityId = text2("parentEntityId", "parent entity identification");
       const pathJSON = get(change, "elementPath");
       if (pathJSON !== void 0 && !isArray(pathJSON))
-        throw new POIError(`Change ${index}: the element path must be a JSON array!`);
-      const elementPath = pathJSON === void 0 || pathJSON.length === 0 ? void 0 : pathJSON.map((segment) => elementPathSegment(segment, index));
+        refused("the element path must be a JSON array!");
+      const elementPath = !isArray(pathJSON) || pathJSON.length === 0 ? void 0 : pathJSON.map((segment) => elementPathSegment(segment, index));
       const parsed = {
         kind,
-        entityType: requireString(change, "entityType", `The entity type of change ${index}`),
-        entityId: requireString(change, "entityId", `The entity of change ${index}`),
-        propertyName: optionalString(change, "propertyName", `The property of change ${index}`),
+        entityType,
+        entityId: entityId2,
+        propertyName,
         oldValue: get(change, "oldValue"),
         newValue: get(change, "newValue"),
-        parentEntityType: optionalString(change, "parentEntityType", `The parent entity type of change ${index}`),
-        parentEntityId: optionalString(change, "parentEntityId", `The parent entity of change ${index}`),
+        parentEntityType,
+        parentEntityId,
         elementPath,
         json: change
       };
       checkChange(parsed, index);
       return parsed;
     });
+    const beforeETags = parseETags(get(json, "beforeETags"), true, `The beforeETags of the change set '${id}'`);
+    const afterETags = parseETags(get(json, "afterETags"), true, `The afterETags of the change set '${id}'`);
+    const description = get(json, "description");
+    if (description !== void 0 && description !== null && !isObject(description))
+      throw new POIError("JSON property 'description' is not an object!");
+    const metadata2 = get(json, "metadata");
+    if (metadata2 !== void 0 && !isObject(metadata2))
+      throw new POIError("The metadata must be a JSON object!");
     const preconditions = parsePreconditions(get(json, "preconditions"));
     const signatures = get(json, "signatures") === void 0 ? [] : requireArray(get(json, "signatures"), `The signatures of the change set '${id}'`).map((item) => {
       const signature = requireObject(item, "A signature of a change set");
@@ -11047,30 +11369,29 @@ var ChangeSet = class _ChangeSet {
           throw new POIError(`The ${property} of a signature of the change set '${id}' must not be empty!`);
       return read;
     });
-    return new _ChangeSet(
-      id,
-      requireString(json, "roamingNetworkId", `The roaming network of the change set '${id}'`),
-      requireTimestamp(json, "createdAt", `The createdAt of the change set '${id}'`),
-      changes,
-      preconditions,
-      parseETags(get(json, "beforeETags"), true, `The beforeETags of the change set '${id}'`),
-      parseETags(get(json, "afterETags"), true, `The afterETags of the change set '${id}'`),
-      signatures,
-      json
-    );
+    if (!id.startsWith(MERGE_CHANGE_SET_ID_PREFIX)) {
+      const contentId = changeSetIdentification(json);
+      if (id !== contentId)
+        throw new POIError(`The change set '${id}' is not identified by its content, '${contentId}'!`);
+      checkRebasedFrom(json, id);
+    }
+    return new _ChangeSet(id, roamingNetworkId, createdAt, changes, preconditions, beforeETags, afterETags, signatures, json);
   }
   /** The description in its first language. */
   get description() {
     const description = get(this.json, "description");
     return isObject(description) && typeof Object.values(description)[0] === "string" ? Object.values(description)[0] : void 0;
   }
-  /** The signature input of one of its signatures (4): the context, its algorithm and key, and the change set without signatures. */
+  /**
+   * The signature input of one of its signatures (4): the context, its algorithm and key, and the change set without
+   * signatures, as WWCP_POI3 writes it again (`ToJSON(Embedded: true, IncludeSignatures: false)`), as it is identified.
+   */
   signingBytes(signature) {
     return canonicalJSONBytes({
       "@context": CHANGE_SET_CONTEXT,
       algorithm: signature.algorithm,
       keyId: signature.keyId,
-      changeSet: without(this.json, "signatures", "@context")
+      changeSet: without(asRead2(this.json), "signatures", "@context")
     });
   }
   /** Verifies one signature with the given key. */
@@ -11224,20 +11545,26 @@ var Commit = class _Commit {
       throw new POIError(`The commit '${id}' of revision 0 has parents!`);
     return commit;
   }
-  /** What the identification is the digest of: the commit without `@id`, its signatures and those of its change set. */
+  /**
+   * What the identification is the digest of: the commit without `@id`, its signatures and those of its change set; its
+   * change set as WWCP_POI3 writes it again, as it identifies a commit over it (RoamingNetworkCommit.TryParse).
+   */
   identificationContent() {
     const content = without(this.json, "@id", "signatures", "changeSet");
     content["@context"] = COMMIT_CONTEXT2;
     if (this.changeSet !== void 0)
-      content["changeSet"] = without(this.changeSet, "signatures", "@context");
+      content["changeSet"] = without(changeSetAsWritten(this.changeSet), "signatures", "@context");
     return content;
   }
-  /** The commit as a signature of it signs it: with its `@context`, its `@id` and the signatures of its change set (5.4). */
+  /**
+   * The commit as a signature of it signs it: with its `@context`, its `@id` and the signatures of its change set (5.4);
+   * its change set as WWCP_POI3 writes it again.
+   */
   signedContent() {
     const content = without(this.json, "signatures", "changeSet");
     content["@context"] = COMMIT_CONTEXT2;
     if (this.changeSet !== void 0)
-      content["changeSet"] = without(this.changeSet, "@context");
+      content["changeSet"] = without(changeSetAsWritten(this.changeSet), "@context");
     return content;
   }
   /** The signature input of one of its signatures (5.4). */
@@ -11469,7 +11796,7 @@ var MANUFACTURER_PROPERTIES = [...PARTY_PROPERTIES, ...CONTACT_PROPERTIES];
 var RNO_PROPERTIES = [...REGISTRY_PROPERTIES, "identityKeys", "eMailAddress", "hotlineEMailAddress", "minConsensus", "keyStatement", "signingKeyCertificates"];
 var PARTY_REGISTRIES = {
   RoamingNetworkOperator: { what: "roaming network operator", article: "a", changeable: RNO_PROPERTIES },
-  ChargingStationOperator: { what: "charging station operator", article: "a", changeable: [...MANUFACTURER_PROPERTIES, "evTaler", "brands"] },
+  ChargingStationOperator: { what: "charging station operator", article: "a", changeable: [...MANUFACTURER_PROPERTIES, "webPaymentURL", "evTaler", "brands"] },
   EMobilityProvider: { what: "e-mobility provider", article: "an", changeable: MANUFACTURER_PROPERTIES },
   GridOperator: { what: "grid operator", article: "a", changeable: PARTY_PROPERTIES },
   ParkingOperator: { what: "parking operator", article: "a", changeable: PARTY_PROPERTIES },
@@ -11798,6 +12125,24 @@ var OPERATOR_CHILD_ARRAYS = {
 };
 var TARIFF_TYPES = /* @__PURE__ */ new Set(["ChargingTariff", "ChargingTariffTemplate", "ChargingTariffGroup", "ChargingTariffOffer"]);
 var INFRASTRUCTURE_TYPES = /* @__PURE__ */ new Set([...Object.keys(OPERATOR_CHILD_ARRAYS), "ChargingPool", "ChargingStation", "EVSE"]);
+var INFRASTRUCTURE_IDS = {
+  ChargingPool: poolId,
+  ChargingStation: stationId,
+  EVSE: evseId,
+  ChargingTariff: tariffId,
+  EVSEGroup: evseGroupId,
+  ChargingStationGroup: stationGroupId,
+  ChargingPoolGroup: poolGroupId,
+  ChargingTariffGroup: tariffGroupId,
+  EVSETemplate: evseTemplateId,
+  ChargingStationTemplate: stationTemplateId,
+  ChargingPoolTemplate: poolTemplateId,
+  ChargingTariffTemplate: tariffTemplateId
+};
+function operatorIdOf(entityType, entityId2) {
+  const id = INFRASTRUCTURE_IDS[entityType]?.(entityId2);
+  return id === void 0 ? void 0 : operatorOf(id);
+}
 var POOL_TEMPLATE_PROPERTIES = [
   "dataLicenses",
   "address",
@@ -11805,6 +12150,7 @@ var POOL_TEMPLATE_PROPERTIES = [
   "parkingType",
   "accessibility",
   "hotline",
+  "webPaymentURL",
   "gridConnectionPointId",
   "brands",
   "openingTimes",
@@ -11835,6 +12181,7 @@ var STATION_TEMPLATE_PROPERTIES = [
   "address",
   "geoLocation",
   "hotline",
+  "webPaymentURL",
   "manufacturerId",
   "modelId",
   "modelURL",
@@ -11917,58 +12264,102 @@ var INFRASTRUCTURE = {
   ChargingPoolTemplate: { what: "charging pool template", changeable: [...BASE_PROPERTIES, "chargingTariffId", "customData", ...POOL_TEMPLATE_PROPERTIES] },
   ChargingTariffTemplate: { what: "charging tariff template", changeable: [...BASE_PROPERTIES, "customData", ...TARIFF_TEMPLATE_PROPERTIES] }
 };
-function asGiven(value, property, where) {
-  const found = notWritten(value, property, property ?? "", "new value");
-  if (found !== void 0)
-    throw new POIError(`${where}: ${found.path === "" ? "it" : `'${found.path}'`} is not given as the content holds it: ${found.reason}!`);
+var heldChecks;
+function asGiven(value, property, change, index, what, heldId) {
+  const check2 = () => {
+    const refused = notHeldAsGiven(value, property, change, index, what, heldId);
+    if (refused !== void 0)
+      throw new POIError(refused);
+  };
+  if (heldChecks === void 0)
+    check2();
+  else
+    heldChecks.push(check2);
   return clone(value);
 }
+function notHeldAsGiven(given2, property, change, index, what, heldId) {
+  const element = change.elementChange;
+  if (element !== void 0 && (element.kind === "RemoveElement" || element.kind === "RemoveElementProperty"))
+    return void 0;
+  const found = notWritten(given2, property, property ?? "", "new value");
+  if (found === void 0 && (heldId === void 0 || !isObject(given2) || given2["@id"] === heldId))
+    return void 0;
+  const held = heldAs(given2, property);
+  if (held === void 0)
+    return found === void 0 ? void 0 : `Change ${index}, the ${what}${change.kind === "Add" ? " to add" : ""}: ${found.path === "" ? "it" : `'${found.path}'`} is not given as the content holds it: ${found.reason}!`;
+  let heldValue = heldId !== void 0 && isObject(held.value) ? { ...held.value, "@id": heldId } : held.value;
+  let givenValue = given2;
+  let named2;
+  if (element !== void 0) {
+    const elementProperty = element.kind === "UpdateElementProperty";
+    const removal = applyElement({ ...element, kind: elementProperty ? "RemoveElementProperty" : "RemoveElement", newValue: void 0 }, heldValue);
+    named2 = `'${pathText(element.elementPath ?? [], elementProperty ? element.propertyName : void 0)}' of the ${what}`;
+    givenValue = element.newValue ?? null;
+    heldValue = removal.error === void 0 ? removal.current : void 0;
+  } else
+    named2 = change.kind === "Add" ? `the ${what} to add` : `the property '${property ?? ""}' of the ${what}`;
+  if (heldValue === void 0)
+    return `Change ${index}: ${named2} is given as '${contentText(givenValue)}', which the content does not hold at all!`;
+  return sameValue(givenValue, heldValue) ? void 0 : `Change ${index}: ${named2} is not given as the content holds it, '${contentText(heldValue)}'!`;
+}
 function insertOrdered(array, entity) {
   const id = asText(entity["@id"]);
   const index = array.findIndex((item) => isObject(item) && ordinal(asText(item["@id"]), id) > 0);
   array.splice(index < 0 ? array.length : index, 0, entity);
 }
 var objectsOf4 = (value) => isArray(value) ? value.filter(isObject) : [];
+function names(stored, entityType, given2) {
+  if (typeof stored !== "string")
+    return false;
+  if (stored === given2)
+    return true;
+  const parse = INFRASTRUCTURE_IDS[entityType];
+  const left = parse?.(stored);
+  const right = parse?.(given2);
+  return left !== void 0 && left.key === right?.key;
+}
 function find(operator, entityType, entityId2) {
-  const operatorId2 = asText(operator["@id"]);
+  const ownId = asText(operator["@id"]);
   const childArray = OPERATOR_CHILD_ARRAYS[entityType];
   if (childArray !== void 0) {
     const children2 = get(operator, childArray);
     for (const child of objectsOf4(children2))
-      if (child["@id"] === entityId2)
-        return { entity: child, container: children2, holder: operator, property: childArray, parentType: "ChargingStationOperator", parentId: operatorId2 };
+      if (names(child["@id"], entityType, entityId2))
+        return { entity: child, container: children2, holder: operator, property: childArray, parentType: "ChargingStationOperator", parentId: ownId };
     return void 0;
   }
   const pools = get(operator, "chargingPools");
   for (const pool of objectsOf4(pools)) {
     if (entityType === "ChargingPool") {
-      if (pool["@id"] === entityId2)
-        return { entity: pool, container: pools, holder: operator, property: "chargingPools", parentType: "ChargingStationOperator", parentId: operatorId2 };
+      if (names(pool["@id"], entityType, entityId2))
+        return { entity: pool, container: pools, holder: operator, property: "chargingPools", parentType: "ChargingStationOperator", parentId: ownId };
       continue;
     }
     const stations = get(pool, "chargingStations");
     for (const station of objectsOf4(stations)) {
       if (entityType === "ChargingStation") {
-        if (station["@id"] === entityId2)
+        if (names(station["@id"], entityType, entityId2))
           return { entity: station, container: stations, holder: pool, property: "chargingStations", parentType: "ChargingPool", parentId: asText(pool["@id"]) };
         continue;
       }
       const evses = get(station, "EVSEs");
       for (const evse2 of objectsOf4(evses))
-        if (evse2["@id"] === entityId2)
+        if (names(evse2["@id"], entityType, entityId2))
           return { entity: evse2, container: evses, holder: station, property: "EVSEs", parentType: "ChargingStation", parentId: asText(station["@id"]) };
     }
   }
   return void 0;
 }
-function operatorOf2(content, entityId2) {
-  let found;
-  for (const operator of objectsOf4(get(content, "chargingStationOperators"))) {
-    const id = asText(operator["@id"]);
-    if (entityId2.startsWith(id + "*") && (found === void 0 || id.length > asText(found["@id"]).length))
-      found = operator;
+var operatorNamed = (content, id) => objectsOf4(get(content, "chargingStationOperators")).find((operator) => operatorId(asText(operator["@id"]))?.key === operatorId(id)?.key);
+function storedId(operator, entityType, entityId2) {
+  if (entityId2 === void 0)
+    return void 0;
+  if (entityType === "ChargingStationOperator") {
+    const given2 = operatorId(entityId2);
+    return given2 !== void 0 && given2.key === operatorId(asText(operator["@id"]))?.key ? asText(operator["@id"]) : void 0;
   }
-  return found;
+  const found = INFRASTRUCTURE_IDS[entityType] === void 0 ? void 0 : find(operator, entityType, entityId2);
+  return found === void 0 ? void 0 : asText(found.entity["@id"]);
 }
 function touchParents(operator, parentType, parentId, lastChange) {
   while ((parentType === "ChargingStation" || parentType === "ChargingPool") && parentId !== void 0) {
@@ -11986,7 +12377,7 @@ function checkOldValue(change, current, index, what) {
   if (change.oldValue === void 0)
     return;
   if (!oldValueMatches(change.oldValue, current))
-    throw new POIError(change.propertyName !== void 0 && (change.kind === "UpdateProperty" || change.kind === "RemoveProperty") ? `Change ${index}: the property '${change.propertyName}' of the ${what} is no longer the expected old value!` : `Change ${index}: the ${what} is no longer the expected old value${current === void 0 ? ": it does not exist" : ""}!`);
+    throw new POIError(change.propertyName !== void 0 && (change.kind === "UpdateProperty" || change.kind === "RemoveProperty") ? `Change ${index}: the property '${change.propertyName}' of the ${what} is no longer the expected old value, but '${contentText(current)}'!` : `Change ${index}: the ${what} is no longer the expected old value${current === void 0 ? ": it does not exist" : ""}!`);
 }
 function resolveElementChange(change, entity, what, index) {
   if (!isElementChange(change))
@@ -12000,20 +12391,21 @@ function resolveElementChange(change, entity, what, index) {
   if (applied.error !== void 0)
     throw new POIError(`Change ${index}: ${change.kind} of the ${what}: ${applied.error}`);
   if (change.oldValue !== void 0 && !oldValueMatches(change.oldValue, applied.current))
-    throw new POIError(`Change ${index}: '${pathText(change.elementPath ?? [], change.propertyName)}' of the ${what} is no longer the expected old value!`);
+    throw new POIError(`Change ${index}: '${pathText(change.elementPath ?? [], change.propertyName)}' of the ${what} is no longer the expected old value, but '${contentText(applied.current)}'!`);
   return {
     ...change,
     kind: applied.newValue === void 0 ? "RemoveProperty" : "UpdateProperty",
     propertyName: property,
     oldValue: void 0,
     newValue: applied.newValue,
-    elementPath: void 0
+    elementPath: void 0,
+    elementChange: change
   };
 }
 function applyProperty(entity, change, index, what, lastChange) {
   const property = change.propertyName;
   if (property === void 0 || property === "@id" || property === "created" || property === "lastChange")
-    throw new POIError(`Change ${index}: the property '${property ?? ""}' of a ${what} can not be changed!`);
+    throw new POIError(`Change ${index}: the property '${property ?? ""}' of ${withArticle(what, false)} can not be changed!`);
   if (change.kind === "RemoveProperty") {
     if (get(entity, property) === void 0)
       throw new POIError(`Change ${index}: the property '${property}' of the ${what} does not exist!`);
@@ -12021,27 +12413,31 @@ function applyProperty(entity, change, index, what, lastChange) {
   } else {
     if (change.newValue === void 0)
       throw new POIError(`Change ${index}: an UpdateProperty needs its newValue!`);
-    set(entity, property, asGiven(change.newValue, property, `Change ${String(index)}, the ${what}`));
+    set(entity, property, asGiven(change.newValue, property, change, index, what));
   }
   if (lastChange !== void 0)
     entity["lastChange"] = lastChange;
 }
-function entityToAdd(change, index, what, createdAt) {
+function entityToAdd(change, index, what, createdAt, heldId) {
   if (!isObject(change.newValue) || change.newValue["@id"] !== change.entityId)
     throw new POIError(`Change ${index}: the ${what} to add must be a JSON object with the identification '${change.entityId}'!`);
-  const added = asGiven(without(change.newValue, "lastChange"), void 0, `Change ${String(index)}, the ${what} to add`);
+  const added = asGiven(without(change.newValue, "lastChange"), void 0, change, index, what, heldId);
   if (get(added, "created") === void 0)
     added["created"] = createdAt;
   added["lastChange"] = createdAt;
   return added;
 }
 function applyInfrastructureChange(content, change, index, createdAt) {
-  const what = `${INFRASTRUCTURE[change.entityType]?.what ?? change.entityType} '${change.entityId}'`;
-  const operator = operatorOf2(content, change.entityId);
+  const description = INFRASTRUCTURE[change.entityType]?.what ?? change.entityType;
+  const what = `${description} '${change.entityId}'`;
+  const ownerId = operatorIdOf(change.entityType, change.entityId);
+  if (ownerId === void 0)
+    throw new POIError(`Change ${index}: invalid ${description} identification '${change.entityId}'!`);
+  const operator = operatorNamed(content, ownerId);
   if (operator === void 0)
-    throw new POIError(`Change ${index}: the charging station operator of the ${what} does not exist!`);
+    throw new POIError(`Change ${index}: the charging station operator '${ownerId}' of the ${what} does not exist!`);
   const found = find(operator, change.entityType, change.entityId);
-  if (found !== void 0 && change.parentEntityType !== void 0 && (change.parentEntityType !== found.parentType || change.parentEntityId !== found.parentId))
+  if (found !== void 0 && change.parentEntityType !== void 0 && (change.parentEntityType !== found.parentType || storedId(operator, change.parentEntityType, change.parentEntityId) !== found.parentId))
     throw new POIError(`Change ${index}: the ${what} belongs to ${found.parentType} '${found.parentId}', not to ${change.parentEntityType} '${change.parentEntityId}'!`);
   change = resolveElementChange(change, found?.entity, what, index);
   if (change.kind !== "Add" && found === void 0)
@@ -12056,36 +12452,38 @@ function applyInfrastructureChange(content, change, index, createdAt) {
     case "RemoveProperty": {
       const infrastructure = required(INFRASTRUCTURE[change.entityType], change.entityType);
       if (!infrastructure.changeable.includes(change.propertyName ?? ""))
-        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of a ${infrastructure.what} can not be changed!`);
+        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of ${withArticle(infrastructure.what, false)} can not be changed!`);
       applyProperty(existing().entity, change, index, what, createdAt);
       break;
     }
     case "Add": {
       if (found !== void 0)
         throw new POIError(`Change ${index}: the ${what} already exists!`);
-      const added = entityToAdd(change, index, what, createdAt);
-      parentType = change.parentEntityType ?? "ChargingStationOperator";
-      parentId = change.parentEntityId ?? asText(operator["@id"]);
+      const added = entityToAdd(change, index, what, createdAt, INFRASTRUCTURE_IDS[change.entityType]?.(change.entityId)?.text);
       let holder;
       let property;
       if (OPERATOR_CHILD_ARRAYS[change.entityType] !== void 0 || change.entityType === "ChargingPool") {
-        if (parentType !== "ChargingStationOperator" || parentId !== operator["@id"])
-          throw new POIError(`Change ${index}: the ${what} is added to its charging station operator '${asText(operator["@id"])}', not to ${parentType} '${parentId}'!`);
+        if (change.parentEntityType !== void 0 && (change.parentEntityType !== "ChargingStationOperator" || storedId(operator, "ChargingStationOperator", change.parentEntityId) === void 0))
+          throw new POIError(`Change ${index}: ${withArticle(what, false)} belongs to ChargingStationOperator '${asText(operator["@id"])}', not to ${change.parentEntityType} '${change.parentEntityId ?? ""}'!`);
         holder = operator;
         property = OPERATOR_CHILD_ARRAYS[change.entityType] ?? "chargingPools";
       } else if (change.entityType === "ChargingStation") {
-        if (parentType !== "ChargingPool")
-          throw new POIError(`Change ${index}: a charging station is added to a charging pool!`);
-        holder = find(operator, "ChargingPool", parentId)?.entity;
+        if (change.parentEntityType !== "ChargingPool" || change.parentEntityId === void 0)
+          throw new POIError(`Change ${index}: adding the charging station '${change.entityId}' needs its ChargingPool as its parent!`);
+        holder = find(operator, "ChargingPool", change.parentEntityId)?.entity;
         property = "chargingStations";
+        if (holder === void 0)
+          throw new POIError(`Change ${index}: the charging pool '${change.parentEntityId}' of the charging station '${change.entityId}' does not exist!`);
       } else {
-        if (parentType !== "ChargingStation")
-          throw new POIError(`Change ${index}: an EVSE is added to a charging station!`);
-        holder = find(operator, "ChargingStation", parentId)?.entity;
+        if (change.parentEntityType !== "ChargingStation" || change.parentEntityId === void 0)
+          throw new POIError(`Change ${index}: adding the EVSE '${change.entityId}' needs its ChargingStation as its parent!`);
+        holder = find(operator, "ChargingStation", change.parentEntityId)?.entity;
         property = "EVSEs";
+        if (holder === void 0)
+          throw new POIError(`Change ${index}: the charging station '${change.parentEntityId}' of the EVSE '${change.entityId}' does not exist!`);
       }
-      if (holder === void 0)
-        throw new POIError(`Change ${index}: the ${parentType} '${parentId}' to add the ${what} to does not exist!`);
+      parentType = change.parentEntityType ?? "ChargingStationOperator";
+      parentId = storedId(operator, parentType, change.parentEntityId ?? asText(operator["@id"]));
       const children2 = get(holder, property);
       if (children2 === void 0)
         set(holder, property, [added]);
@@ -12103,9 +12501,10 @@ function applyInfrastructureChange(content, change, index, createdAt) {
       break;
     }
     default:
-      throw new POIError(`Change ${index}: ${change.kind} of a ${change.entityType} is not supported by this library yet!`);
+      throw new POIError(`Change ${index}: ${change.kind} of ${withArticle(INFRASTRUCTURE[change.entityType]?.what ?? change.entityType, false)} is not supported by this library yet!`);
   }
   touchParents(operator, parentType, parentId, createdAt);
+  return { type: "ChargingStationOperator", json: operator };
 }
 function applyNetworkArrayChange(content, change, index, createdAt) {
   const property = required(NETWORK_ARRAYS[change.entityType], `Change ${index}: ${change.entityType} is no party!`);
@@ -12127,7 +12526,7 @@ function applyNetworkArrayChange(content, change, index, createdAt) {
     case "UpdateProperty":
     case "RemoveProperty":
       applyProperty(existing(), change, index, what, createdAt);
-      break;
+      return { type: change.entityType, json: existing() };
     case "Add": {
       if (entity !== void 0)
         throw new POIError(`Change ${index}: the ${what} already exists!`);
@@ -12136,7 +12535,7 @@ function applyNetworkArrayChange(content, change, index, createdAt) {
         set(content, property, [added]);
       else if (isArray(array))
         insertOrdered(array, added);
-      break;
+      return { type: change.entityType, json: added };
     }
     case "Remove": {
       if (entity === void 0)
@@ -12145,10 +12544,10 @@ function applyNetworkArrayChange(content, change, index, createdAt) {
       items.splice(items.indexOf(entity), 1);
       if (items.length === 0)
         unset(content, property);
-      break;
+      return void 0;
     }
     default:
-      throw new POIError(`Change ${index}: ${change.kind} of a ${change.entityType} is not supported by this library yet!`);
+      throw new POIError(`Change ${index}: ${change.kind} of ${registry.article} ${registry.what} is not supported by this library yet!`);
   }
 }
 function partyChildOf(content, type, childId) {
@@ -12182,7 +12581,7 @@ function applyPartyChildChange(content, change, index, createdAt) {
     if (change.kind !== "Add" && found2 === void 0)
       throw new POIError(`Change ${index}: the ${what} of the ${type.inParent} '${asText(party2["@id"])}' does not exist!`);
     applyPartyChild(type, party2, found2, change, index, what, createdAt);
-    return;
+    return { type: type.parentType, json: party2 };
   }
   const found = partyChildOf(content, type, change.entityId);
   let party;
@@ -12201,6 +12600,7 @@ function applyPartyChildChange(content, change, index, createdAt) {
     party = found.party;
   }
   applyPartyChild(type, party, found, change, index, what, createdAt);
+  return { type: type.parentType, json: party };
 }
 function applyPartyChild(type, party, found, change, index, what, createdAt) {
   change = resolveElementChange(change, found?.child, what, index);
@@ -12214,7 +12614,7 @@ function applyPartyChild(type, party, found, change, index, what, createdAt) {
       const property = change.propertyName ?? "";
       const child = existing().child;
       if (!type.changeable.includes(property))
-        throw new POIError(type.keepsVersion === true && property === "version" ? `Change ${index}: the version of the ${what} can not be changed: a new version is a new release!` : `Change ${index}: the property '${property}' of a ${type.what} can not be changed!`);
+        throw new POIError(type.keepsVersion === true && property === "version" ? `Change ${index}: the version of the ${what} can not be changed: a new version is a new release!` : `Change ${index}: the property '${property}' of ${withArticle(type.what, false)} can not be changed!`);
       if (change.kind === "RemoveProperty") {
         if (get(child, property) === void 0)
           throw new POIError(`Change ${index}: the property '${property}' of the ${what} does not exist!`);
@@ -12222,14 +12622,14 @@ function applyPartyChild(type, party, found, change, index, what, createdAt) {
       } else {
         if (change.newValue === void 0)
           throw new POIError(`Change ${index}: an UpdateProperty needs its newValue!`);
-        set(child, property, asGiven(change.newValue, property, `Change ${String(index)}, the ${what}`));
+        set(child, property, asGiven(change.newValue, property, change, index, what));
       }
       break;
     }
     case "Add": {
       if (!isObject(change.newValue) || typeof change.newValue["@id"] !== "string" || !sameId4(change.newValue["@id"], change.entityId))
         throw new POIError(`Change ${index}: the ${type.what} to add must be a JSON object with the identification '${change.entityId}'!`);
-      const added = asGiven(without(change.newValue, "lastChange"), void 0, `Change ${String(index)}, the ${what} to add`);
+      const added = asGiven(without(change.newValue, "lastChange"), void 0, change, index, what);
       const children2 = get(party, type.property);
       if (children2 === void 0)
         set(party, type.property, [added]);
@@ -12247,7 +12647,7 @@ function applyPartyChild(type, party, found, change, index, what, createdAt) {
       break;
     }
     default:
-      throw new POIError(`Change ${index}: ${change.kind} of a ${type.what} is not supported by this library yet!`);
+      throw new POIError(`Change ${index}: ${change.kind} of ${withArticle(type.what, false)} is not supported by this library yet!`);
   }
   party["lastChange"] = createdAt;
 }
@@ -12259,15 +12659,17 @@ function applyEmbeddedChange(content, change, index, createdAt, type) {
   const what = `${type.what} '${gridPoint ? id.text : change.entityId}'`;
   const found = embeddedOf(content, type, change.entityId);
   let party;
+  let partyType;
   let property;
   if (change.kind === "Add") {
     if (found !== void 0)
       throw new POIError(gridPoint ? `Change ${index}: the ${what} already exists, at the grid operator '${asText(found.party["@id"])}'!` : `Change ${index}: the ${what} already exists!`);
     const parentProperty = change.parentEntityType === void 0 ? void 0 : type.owners[change.parentEntityType];
     const parent = change.parentEntityType === void 0 || parentProperty === void 0 ? void 0 : partyNamed(content, change.parentEntityType, change.parentEntityId);
-    if (parent === void 0 || parentProperty === void 0)
+    if (parent === void 0 || parentProperty === void 0 || change.parentEntityType === void 0)
       throw new POIError(`Change ${index}: the ${what} to add needs its ${type.addNeeds(change.parentEntityType)}, an existing one!`);
     party = parent;
+    partyType = change.parentEntityType;
     property = parentProperty;
   } else {
     if (found === void 0)
@@ -12275,6 +12677,7 @@ function applyEmbeddedChange(content, change, index, createdAt, type) {
     if (change.parentEntityType !== void 0 && (change.parentEntityType !== found.partyType || change.parentEntityId === void 0 || !sameId4(change.parentEntityId, asText(found.party["@id"]))))
       throw new POIError(`Change ${index}: the ${what} belongs to ${found.partyType} '${asText(found.party["@id"])}', not to ${change.parentEntityType} '${change.parentEntityId ?? ""}'!`);
     party = found.party;
+    partyType = found.partyType;
     property = required(type.owners[found.partyType], found.partyType);
   }
   change = resolveElementChange(change, found?.child, what, index);
@@ -12285,14 +12688,14 @@ function applyEmbeddedChange(content, change, index, createdAt, type) {
     case "UpdateProperty":
     case "RemoveProperty":
       if (!type.changeable.includes(change.propertyName ?? ""))
-        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of a ${type.what} can not be changed!`);
+        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of ${withArticle(type.what, false)} can not be changed!`);
       applyProperty(existing().child, change, index, what, type.timestamps ? createdAt : void 0);
       break;
     case "Add": {
       const given2 = change.newValue;
       if (!isObject(given2) || typeof given2["@id"] !== "string" || (gridPoint ? type.id(given2["@id"])?.key !== id.key : given2["@id"] !== change.entityId))
         throw new POIError(`Change ${index}: the ${type.what} to add must be a JSON object with the identification '${gridPoint ? id.text : change.entityId}'!`);
-      const added = type.timestamps ? entityToAdd(change, index, what, createdAt) : asGiven(given2, void 0, `Change ${String(index)}, the ${what} to add`);
+      const added = type.timestamps ? entityToAdd(change, index, what, createdAt) : asGiven(given2, void 0, change, index, what);
       const children2 = get(party, property);
       if (children2 === void 0)
         set(party, property, [added]);
@@ -12310,9 +12713,10 @@ function applyEmbeddedChange(content, change, index, createdAt, type) {
       break;
     }
     default:
-      throw new POIError(`Change ${index}: ${change.kind} of a ${type.what} is not supported by this library yet!`);
+      throw new POIError(`Change ${index}: ${change.kind} of ${withArticle(type.what, false)} is not supported by this library yet!`);
   }
   party["lastChange"] = createdAt;
+  return { type: partyType, json: party };
 }
 function energyMeterChildOf(content, type, childId) {
   for (const [partyType, parties] of [["ChargingStationOperator", "chargingStationOperators"], ["GridOperator", "gridOperators"]])
@@ -12329,19 +12733,22 @@ function applyEnergyMeterChildChange(content, change, index, createdAt) {
   const what = `${type.what} '${change.entityId}'`;
   const found = energyMeterChildOf(content, type, change.entityId);
   let party;
+  let partyType;
   if (change.kind === "Add") {
     if (found !== void 0)
       throw new POIError(`Change ${index}: the ${what} already exists!`);
     const parent = change.parentEntityType === "ChargingStationOperator" || change.parentEntityType === "GridOperator" ? partyNamed(content, change.parentEntityType, change.parentEntityId) : void 0;
-    if (parent === void 0)
+    if (parent === void 0 || change.parentEntityType === void 0)
       throw new POIError(`Change ${index}: the ${what} to add needs its ChargingStationOperator or GridOperator, an existing one!`);
     party = parent;
+    partyType = change.parentEntityType;
   } else {
     if (found === void 0)
       throw new POIError(`Change ${index}: the ${what} does not exist!`);
     if (change.parentEntityType !== void 0 && (change.parentEntityType !== found.partyType || change.parentEntityId === void 0 || !sameId4(change.parentEntityId, asText(found.party["@id"]))))
       throw new POIError(`Change ${index}: the ${what} belongs to ${found.partyType} '${asText(found.party["@id"])}', not to ${change.parentEntityType} '${change.parentEntityId ?? ""}'!`);
     party = found.party;
+    partyType = found.partyType;
   }
   change = resolveElementChange(change, found?.child, what, index);
   const isProperty = change.kind === "UpdateProperty" || change.kind === "RemoveProperty";
@@ -12351,7 +12758,7 @@ function applyEnergyMeterChildChange(content, change, index, createdAt) {
     case "UpdateProperty":
     case "RemoveProperty":
       if (!type.changeable.includes(change.propertyName ?? ""))
-        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of an ${type.what} can not be changed!`);
+        throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of ${withArticle(type.what, false)} can not be changed!`);
       applyProperty(existing().child, change, index, what, createdAt);
       break;
     case "Add": {
@@ -12373,37 +12780,77 @@ function applyEnergyMeterChildChange(content, change, index, createdAt) {
       break;
     }
     default:
-      throw new POIError(`Change ${index}: ${change.kind} of an ${type.what} is not supported by this library yet!`);
+      throw new POIError(`Change ${index}: ${change.kind} of ${withArticle(type.what, false)} is not supported by this library yet!`);
   }
   party["lastChange"] = createdAt;
+  return { type: partyType, json: party };
 }
 var NETWORK_PROPERTIES = ["name", "description", "dataSource", "dataLicenses", "treeHashAlgorithms", "customData"];
+function invalidNetworkValue(property, value) {
+  switch (property) {
+    case "name":
+    case "description":
+      return isObject(value) ? void 0 : `invalid ${property}: A multi-language text must be a JSON object!`;
+    case "dataSource":
+      return typeof value === "string" && trimmed(value) !== "" ? void 0 : "the data source must be a nonempty text!";
+    case "dataLicenses":
+      return dataLicenses({ dataLicenses: value });
+    case "treeHashAlgorithms":
+      return value === null ? "the tree hash algorithms must be an array of hash algorithms!" : invalidTreeHashAlgorithms(value);
+    case "customData":
+      return isObject(value) ? void 0 : "the custom data must be a JSON object!";
+    case "signingKeys":
+    case "identityKeys":
+      return "a roaming network has no keys of its own: they are the keys of its RoamingNetworkOperator!";
+    default:
+      return `the property '${property}' of a roaming network can not be changed!`;
+  }
+}
 function applyNetworkChange(content, change, index, createdAt) {
   const what = `roaming network '${asText(content["@id"])}'`;
-  const property = entityPropertyName(change) ?? "";
-  const held = NETWORK_PROPERTIES.includes(property) ? get(content, property) : void 0;
   const own = {};
+  const ownValue = (property2) => NETWORK_PROPERTIES.includes(property2) ? get(content, property2) : void 0;
+  const given2 = entityPropertyName(change) ?? "";
+  const held = ownValue(given2);
   if (held !== void 0)
-    set(own, property, held);
+    set(own, given2, held);
   change = resolveElementChange(change, own, what, index);
-  if (change.kind !== "UpdateProperty" && change.kind !== "RemoveProperty")
-    throw new POIError(`Change ${index}: ${change.kind} of the roaming network itself is not possible!`);
-  if (!NETWORK_PROPERTIES.includes(change.propertyName ?? ""))
-    throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of a roaming network can not be changed!`);
-  checkOldValue(change, get(content, change.propertyName ?? ""), index, what);
+  const property = change.propertyName ?? "";
+  const current = ownValue(property);
+  if (change.oldValue !== void 0 && !oldValueMatches(change.oldValue, current))
+    throw new POIError(`Change ${index}: the property '${property}' is no longer the expected old value, but '${contentText(current)}'!`);
+  switch (change.kind) {
+    case "UpdateProperty": {
+      const invalid = change.newValue === void 0 ? void 0 : invalidNetworkValue(property, change.newValue);
+      if (invalid !== void 0)
+        throw new POIError(`Change ${index}: ${invalid}`);
+      break;
+    }
+    case "RemoveProperty":
+      if (current === void 0)
+        throw new POIError(`Change ${index}: the property '${property}' does not exist!`);
+      break;
+    default:
+      throw new POIError(`Change ${index}: ${change.kind} of the roaming network itself is not supported yet!`);
+  }
   applyProperty(content, change, index, what, createdAt);
 }
 function applyOperatorChange(content, change, index, createdAt) {
+  if (change.kind === "Add" || change.kind === "Remove")
+    throw new POIError(`Change ${index}: the operator of a roaming network is changed, but neither added nor removed!`);
+  if (change.parentEntityType !== void 0 && (change.parentEntityType !== "RoamingNetwork" || change.parentEntityId !== content["@id"]))
+    throw new POIError(`Change ${index}: a roaming network operator of this roaming network belongs to RoamingNetwork '${asText(content["@id"])}', not to ${change.parentEntityType} '${change.parentEntityId}'!`);
   const operator = get(content, "operator");
   if (!isObject(operator) || operator["@id"] !== change.entityId)
-    throw new POIError(`Change ${index}: the roaming network operator '${change.entityId}' is not the one of this roaming network!`);
+    throw new POIError(`Change ${index}: the roaming network operator '${change.entityId}' does not exist!`);
   change = resolveElementChange(change, operator, `roaming network operator '${change.entityId}'`, index);
   if (change.kind !== "UpdateProperty" && change.kind !== "RemoveProperty")
-    throw new POIError(`Change ${index}: the roaming network operator is neither added nor removed!`);
+    throw new POIError(`Change ${index}: the operator of a roaming network is changed, but neither added nor removed!`);
   if (!RNO_PROPERTIES.includes(change.propertyName ?? ""))
     throw new POIError(`Change ${index}: the property '${change.propertyName ?? ""}' of a roaming network operator can not be changed!`);
   checkOldValue(change, get(operator, change.propertyName ?? ""), index, `roaming network operator '${change.entityId}'`);
   applyProperty(operator, change, index, `roaming network operator '${change.entityId}'`, createdAt);
+  return { type: "RoamingNetworkOperator", json: operator };
 }
 function partiesOf(network) {
   const parties = /* @__PURE__ */ new Map();
@@ -12418,6 +12865,26 @@ function partiesOf(network) {
         });
   return parties;
 }
+var mayAll = (key2, usages) => usages.every((usage) => key2.maySign(usage));
+var WEB_PAYMENT_PAGES = /* @__PURE__ */ new Set(["ChargingStationOperator", "ChargingPool", "ChargingStation", "ChargingPoolTemplate", "ChargingStationTemplate"]);
+var isGiven4 = (value) => value !== void 0 && value !== null;
+function addsWebPaymentURL(change) {
+  if (change.kind !== "Add" || !isObject(change.newValue))
+    return false;
+  const entity = change.newValue;
+  const stations = entity["chargingStations"];
+  switch (change.entityType) {
+    case "ChargingPool":
+      return isGiven4(entity["webPaymentURL"]) || isArray(stations) && stations.some((station) => isObject(station) && isGiven4(station["webPaymentURL"]));
+    case "ChargingStation":
+    case "ChargingPoolTemplate":
+    case "ChargingStationTemplate":
+      return isGiven4(entity["webPaymentURL"]);
+    default:
+      return false;
+  }
+}
+var usagesOf = (change, usage) => WEB_PAYMENT_PAGES.has(change.entityType) && entityPropertyName(change) === "webPaymentURL" ? [KeyUsages.Payments] : usage !== KeyUsages.Payments && addsWebPaymentURL(change) ? [usage, KeyUsages.Payments] : [usage];
 var partyKeyOf = (party) => `${party.type}:${party.id.toUpperCase()}`;
 var partyRefOf = (content, type, id) => ({ type, id: asText(partyNamed(content, type, id)?.["@id"] ?? id) });
 var notRemoved = (earlier, party) => earlier.removedParties.has(partyKeyOf(party)) ? null : party;
@@ -12572,13 +13039,13 @@ function ownerOf(content, change, index, earlier) {
   if (embeddedOwners !== void 0)
     return embeddedOwners;
   if (INFRASTRUCTURE_TYPES.has(change.entityType)) {
-    const operator = operatorOf2(content, change.entityId);
-    if (operator === void 0)
-      throw new POIError(`Change ${index}: the charging station operator of the ${change.entityType} '${change.entityId}' does not exist!`);
+    const ownerId = operatorIdOf(change.entityType, change.entityId);
+    if (ownerId === void 0)
+      throw new POIError(`Change ${index}: the identification '${change.entityId}' of the ${change.entityType} names no charging station operator!`);
     return {
       kind: "party",
       type: "ChargingStationOperator",
-      id: asText(operator["@id"]),
+      id: ownerId,
       usage: TARIFF_TYPES.has(change.entityType) ? KeyUsages.Tariffs : KeyUsages.Infrastructure,
       keys: "signing"
     };
@@ -12664,24 +13131,32 @@ function checkOwnership(before, changeSet) {
     if (!valid2.has(key2.id))
       throw new POIError(`The new identity key '${key2.id}' did not sign the change set: no proof of possession!`);
   const signedValid = (key2) => valid2.has(key2.id) && key2.isValidAt(createdAt);
-  const rnoHolders = (keys, ...usages) => new Set([
-    ...keys !== "identity" ? rnoSigning.filter((key2) => [KeyUsages.Party, ...usages].some((usage) => key2.maySign(usage))) : [],
+  const rnoHolders = (keys, usages = []) => new Set([
+    ...keys !== "identity" ? rnoSigning.filter((key2) => key2.maySign(KeyUsages.Party) || usages.length > 0 && mayAll(key2, usages)) : [],
     ...keys !== "signing" ? rnoIdentity : []
   ].filter(signedValid).map((key2) => key2.holderOrUnnamed));
-  const signs = (owner) => {
+  const signs = (owner, change) => {
     if (owner.kind === "rno")
       return rno !== void 0 && rnoHolders(owner.keys).size >= minConsensus;
     const party = parties.get(`${owner.type}:${owner.id}`);
-    return party !== void 0 && (owner.keys !== "identity" && party.signingKeys.some((key2) => key2.maySign(owner.usage) && signedValid(key2)) || owner.keys !== "signing" && party.identityKeys.some(signedValid) || owner.keys !== "signing" && rnoHolders("identity").size >= minConsensus && rnoIdentity.some(signedValid) || owner.keys === "signing" && owner.inPlace !== false && party.signingKeys.length === 0 && rnoHolders("signing", owner.usage).size >= minConsensus);
+    const usages = usagesOf(change, owner.usage);
+    return party !== void 0 && (owner.keys !== "identity" && party.signingKeys.some((key2) => mayAll(key2, usages) && signedValid(key2)) || owner.keys !== "signing" && party.identityKeys.some(signedValid) || owner.keys !== "signing" && rnoHolders("identity").size >= minConsensus && rnoIdentity.some(signedValid) || owner.keys === "signing" && owner.inPlace !== false && party.signingKeys.length === 0 && rnoHolders("signing", usages).size >= minConsensus);
+  };
+  const inPlaceOf = (owner) => owner.kind === "party" && owner.keys === "signing" && owner.inPlace !== false && parties.get(`${owner.type}:${owner.id}`)?.signingKeys.length === 0;
+  const rnoInWords = rno === void 0 ? "the roaming network operator, of which this roaming network has none" : `the roaming network operator '${rno.id}'`;
+  const byQuorum = (owner) => minConsensus > 1 && (owner.kind === "rno" || inPlaceOf(owner));
+  const signatureOf2 = (owner) => {
+    const kind = owner.keys === "identity" ? "identity" : "signing";
+    return owner.kind === "rno" || inPlaceOf(owner) ? byQuorum(owner) ? `${kind} keys of ${minConsensus} holders of ${rnoInWords}` : `a${kind === "identity" ? "n" : ""} ${kind} key of ${rnoInWords}` : owner.keys === "identity" ? `an identity key of the ${owner.type} '${owner.id}'` : `a signing key of the ${owner.type} '${owner.id}'`;
   };
-  const signatureOf2 = (owner) => owner.kind === "rno" ? `${owner.keys === "identity" ? "an identity key" : "a signing key"} of the roaming network operator '${rno?.id ?? ""}'` : owner.keys === "identity" ? `an identity key of the ${owner.type} '${owner.id}'` : `a signing key of the ${owner.type} '${owner.id}'`;
+  const signaturesOf = (owners) => `${owners.some(byQuorum) ? "signatures" : "a signature"} by ${[...new Set(owners.map(signatureOf2))].join(" or ")}`;
   changeSet.changes.forEach((change, index) => {
     checkPartyChange(change, index);
     const owned = ownerOf(before.content, change, index, earlier);
     const owners = isOwnerList(owned) ? owned : [owned];
     if (owners.length > 1) {
-      if (!owners.some(signs))
-        throw new POIError(`${describeChange(change, index)} needs a signature by ${owners.map(signatureOf2).join(" or ")}!`);
+      if (!owners.some((owner2) => signs(owner2, change)))
+        throw new POIError(`${describeChange(change, index)} needs ${signaturesOf(owners)}!`);
       return;
     }
     const owner = required(owners[0], `Change ${index} has no owner!`);
@@ -12695,14 +13170,21 @@ function checkOwnership(before, changeSet) {
     }
     const party = parties.get(`${owner.type}:${owner.id}`);
     if (party === void 0)
-      throw new POIError(`${describeChange(change, index)}: the ${owner.type} '${owner.id}' does not exist!`);
-    const bySigningKey = owner.keys !== "identity" && party.signingKeys.some((key2) => key2.maySign(owner.usage) && signedValid(key2));
+      throw new POIError(owner.keys === "identity" ? `${describeChange(change, index)} needs a signature by an identity key of the ${owner.type} '${owner.id}'!` : `${describeChange(change, index)} needs a signature by a signing key of the ${owner.type} '${owner.id}'!`);
+    const usages = usagesOf(change, owner.usage);
+    const bySigningKey = owner.keys !== "identity" && party.signingKeys.some((key2) => mayAll(key2, usages) && signedValid(key2));
     const byIdentityKey = owner.keys !== "signing" && party.identityKeys.some(signedValid);
     const byRecovery = owner.keys !== "signing" && rnoHolders("identity").size >= minConsensus && rnoIdentity.some(signedValid);
-    const byRNO = owner.keys === "signing" && owner.inPlace !== false && party.signingKeys.length === 0 && rnoHolders("signing", owner.usage).size >= minConsensus;
+    const byRNO = owner.keys === "signing" && owner.inPlace !== false && party.signingKeys.length === 0 && rnoHolders("signing", usages).size >= minConsensus;
     if (!bySigningKey && !byIdentityKey && !byRecovery && !byRNO) {
+      const allOf = usages.map((usage) => `'${usage}'`).join(" and ");
+      if (inPlaceOf(owner)) {
+        const anyOf2 = usages.length === 1 && usages[0] === KeyUsages.Party ? allOf : `${allOf} or '${KeyUsages.Party}'`;
+        const named2 = rnoSigning.some((key2) => signedValid(key2) && !mayAll(key2, usages) && !key2.maySign(KeyUsages.Party));
+        throw new POIError(`${describeChange(change, index)} needs ${signaturesOf([owner])}${named2 ? ` that may sign ${anyOf2}` : ""}!`);
+      }
       const mayAnyway = party.signingKeys.some(signedValid);
-      throw new POIError(owner.keys === "identity" ? `${describeChange(change, index)} needs a signature by an identity key of the ${owner.type} '${owner.id}'!` : mayAnyway ? `${describeChange(change, index)} needs a signature by a signing key of the ${owner.type} '${owner.id}' that may sign '${owner.usage}'!` : `${describeChange(change, index)} needs a signature by a signing key of the ${owner.type} '${owner.id}'!`);
+      throw new POIError(owner.keys === "identity" ? `${describeChange(change, index)} needs a signature by an identity key of the ${owner.type} '${owner.id}'!` : mayAnyway ? `${describeChange(change, index)} needs a signature by a signing key of the ${owner.type} '${owner.id}' that may sign ${allOf}!` : `${describeChange(change, index)} needs a signature by a signing key of the ${owner.type} '${owner.id}'!`);
     }
   });
 }
@@ -12721,7 +13203,7 @@ function stampOf(before, changeSet) {
   return last !== void 0 && last > changeSet.createdAt ? last : changeSet.createdAt;
 }
 function applyChangeSet(before, changeSet, options = {}) {
-  if (changeSet.roamingNetworkId !== before.id)
+  if (ignoringCase(changeSet.roamingNetworkId) !== ignoringCase(before.id))
     throw new POIError(`The change set is for the roaming network '${changeSet.roamingNetworkId}', not for '${before.id}'!`);
   if (options.checkOwnership ?? true)
     checkOwnership(before, changeSet);
@@ -12731,23 +13213,37 @@ function applyChangeSet(before, changeSet, options = {}) {
     throw new POIError(`The change set does not fit this version of the roaming network: ${broken}`);
   const content = clone(before.content);
   const createdAt = toTimestamp(stampOf(before, changeSet));
-  changeSet.changes.forEach((change, index) => {
+  function applyChange(change, index) {
+    let changed;
     if (change.entityType === "RoamingNetwork" && change.entityId === before.id)
       applyNetworkChange(content, change, index, createdAt);
     else if (change.entityType === "RoamingNetworkOperator")
-      applyOperatorChange(content, change, index, createdAt);
+      changed = applyOperatorChange(content, change, index, createdAt);
     else if (NETWORK_ARRAYS[change.entityType] !== void 0)
-      applyNetworkArrayChange(content, change, index, createdAt);
+      changed = applyNetworkArrayChange(content, change, index, createdAt);
     else if (PARTY_CHILD_TYPES[change.entityType] !== void 0)
-      applyPartyChildChange(content, change, index, createdAt);
+      changed = applyPartyChildChange(content, change, index, createdAt);
     else if (ENERGY_METER_CHILD_TYPES[change.entityType] !== void 0)
-      applyEnergyMeterChildChange(content, change, index, createdAt);
+      changed = applyEnergyMeterChildChange(content, change, index, createdAt);
     else if (embeddedTypeOf(content, change) !== void 0)
-      applyEmbeddedChange(content, change, index, createdAt, required(embeddedTypeOf(content, change), change.entityType));
+      changed = applyEmbeddedChange(content, change, index, createdAt, required(embeddedTypeOf(content, change), change.entityType));
     else if (INFRASTRUCTURE_TYPES.has(change.entityType))
-      applyInfrastructureChange(content, change, index, createdAt);
+      changed = applyInfrastructureChange(content, change, index, createdAt);
     else
       throw new POIError(`Change ${index}: changes of ${change.entityType} '${change.entityId}' are not supported by this library yet!`);
+    const invalid = changed === void 0 ? void 0 : changed.type === "RoamingNetworkOperator" ? invalidRoamingNetworkOperator(changed.json, before.id) : invalidParty(changed.type, changed.json);
+    if (invalid !== void 0)
+      throw new POIError(`Change ${index}: ${invalid}`);
+    for (const check2 of heldChecks ?? [])
+      check2();
+  }
+  changeSet.changes.forEach((change, index) => {
+    heldChecks = [];
+    try {
+      applyChange(change, index);
+    } finally {
+      heldChecks = void 0;
+    }
   });
   const groupOrOffer = objectsOf4(get(content, "chargingStationOperators")).sort((left, right) => ordinal(asText(left["@id"]), asText(right["@id"]))).map((operator) => invalidGroupOrOffer(operator) ?? invalidPaymentOption(operator)).find((error) => error !== void 0);
   if (groupOrOffer !== void 0)
@@ -13712,7 +14208,7 @@ function manufacturerOf(network, kind, id) {
 }
 var CHARGING_STATION_ID = /^([a-zA-Z]{2}\*?[a-zA-Z0-9]{3})\*?S([a-zA-Z0-9][a-zA-Z0-9*]{0,29})$/u;
 var OPERATOR_ID = /^([A-Z]{2})\*?([A-Z0-9]{3})$/u;
-function operatorIdOf(text2) {
+function operatorIdOf2(text2) {
   const match = OPERATOR_ID.exec((idOf2(text2) ?? "").toUpperCase());
   return match === null ? void 0 : `${match[1] ?? ""}*${match[2] ?? ""}`;
 }
@@ -13720,13 +14216,13 @@ function chargingStationIdOf(text2) {
   const match = CHARGING_STATION_ID.exec(idOf2(text2) ?? "");
   if (match === null)
     return void 0;
-  const operatorId2 = operatorIdOf(match[1] ?? "");
+  const operatorId2 = operatorIdOf2(match[1] ?? "");
   return operatorId2 === void 0 ? void 0 : { operatorId: operatorId2, suffix: match[2] ?? "" };
 }
 var chargingStationIdText = (id) => `${id.operatorId}*S${id.suffix}`;
 var sameChargingStation = (left, right) => left.operatorId === right.operatorId && sameId(left.suffix.replaceAll("*", ""), right.suffix.replaceAll("*", ""));
 function effectiveChargingStationOf(network, id) {
-  const operator = objectsOf5(get(network.effectiveContent, "chargingStationOperators")).find((item) => operatorIdOf(entityId(item)) === id.operatorId);
+  const operator = objectsOf5(get(network.effectiveContent, "chargingStationOperators")).find((item) => operatorIdOf2(entityId(item)) === id.operatorId);
   for (const pool of objectsOf5(get(operator ?? {}, "chargingPools")))
     for (const station of objectsOf5(get(pool, "chargingStations"))) {
       const stationId2 = chargingStationIdOf(entityId(station));
@@ -16125,6 +16621,16 @@ var EVTalerContractTerms = class _EVTalerContractTerms {
     };
   }
 };
+function evTalerSessionPrices(station, evseId2, priceStatements, at) {
+  const tariff2 = evTalerTariff(station, evseId2);
+  const current = verifyPriceStatements(station, priceStatements, { at });
+  const tariffId2 = idOf7(tariff2);
+  const specificity = (entityType) => entityType === "EVSE" ? 0 : entityType === "ChargingStation" ? 1 : 2;
+  const [priceStatement] = [...current.values()].filter((candidate) => candidate.statement.prices.some((prices) => tariffId(textOf4(get(prices, "chargingTariffId")))?.text === tariffId2)).sort((left, right) => specificity(left.statement.entityType) - specificity(right.statement.entityType));
+  const objects4 = (value) => isArray(value) ? value.filter(isObject) : [];
+  const elements = priceStatement !== void 0 ? objects4(get(objects4(get(priceStatement.statement.priceStatus, "prices")).find((prices) => get(prices, "chargingTariffId") === tariffId2) ?? {}, "elements")) : objects4(get(tariff2, "elements"));
+  return { tariff: tariff2, ...priceStatement === void 0 ? {} : { priceStatement }, elements };
+}
 function evTalerTariff(station, evseId2) {
   const tariffs = station.tariffs.get(evseId2) ?? [];
   const typeOf2 = (tariff3) => {
@@ -17118,10 +17624,33 @@ function verifyPricePublication(receipts, policy, subject) {
   });
 }
 
+// src/verifier/grossRates.ts
+function grossRates(currency2, elements) {
+  if (elements.length !== 1) return void 0;
+  const element = elements[0];
+  if (element === void 0 || Object.keys(element).some((key2) => key2 !== "priceComponents" && key2 !== "restrictions")) return void 0;
+  if (element["restrictions"] !== void 0 && (!isObject(element["restrictions"]) || Object.keys(element["restrictions"]).length > 0)) return void 0;
+  const components = element["priceComponents"];
+  if (!Array.isArray(components) || components.length === 0) return void 0;
+  const rates = { currency: currency2 };
+  for (const raw of components) {
+    if (!isObject(raw) || Object.keys(raw).some((key2) => !["type", "price", "stepSize"].includes(key2))) return void 0;
+    const type = raw["type"], value = raw["price"], step = raw["stepSize"];
+    if (!isNumber(value) || Decimal.parse(asText(value)).mantissa < 0n) return void 0;
+    if (type === "FLAT" ? "stepSize" in raw : typeof step !== "number" || !Number.isSafeInteger(step) || step < 1) return void 0;
+    const field = type === "ENERGY" ? "energyPerKWh" : type === "FLAT" ? "flatFee" : type === "TIME" ? "timePerHour" : void 0;
+    if (field === void 0 || rates[field] !== void 0) return void 0;
+    rates[field] = asText(value);
+  }
+  return rates;
+}
+
 // src/verifier/sessionPrices.ts
 var SESSION_PRICE_EVIDENCE_CONTEXT = "https://open.charging.cloud/contexts/wwcp/sessionPriceEvidence/v1";
 var SESSION_PRICE_AGREEMENT_CONTEXT = "https://open.charging.cloud/contexts/wwcp/sessionPriceAgreement/v1";
 var SIMPLE_GROSS_PRICE_PROFILE = "chargy-gross-rates/v1";
+var CONTRACT_GROSS_PRICE_PROFILE = "chargy-contract-gross-rates/v1";
+var GROSS_PRICE_PROFILES = /* @__PURE__ */ new Map([["adhoc", SIMPLE_GROSS_PRICE_PROFILE], ["contract", CONTRACT_GROSS_PRICE_PROFILE]]);
 var SessionPriceAgreement = class _SessionPriceAgreement {
   constructor(json, chargingStarted, signedAt) {
     this.json = json;
@@ -17172,24 +17701,6 @@ function parseSessionPriceEvidence(value) {
     })
   };
 }
-function grossRates(currency2, elements) {
-  if (elements.length !== 1) return void 0;
-  const element = elements[0];
-  if (element === void 0 || Object.keys(element).some((key2) => key2 !== "priceComponents" && key2 !== "restrictions")) return void 0;
-  if (element["restrictions"] !== void 0 && (!isObject(element["restrictions"]) || Object.keys(element["restrictions"]).length > 0)) return void 0;
-  const components = element["priceComponents"];
-  if (!Array.isArray(components) || components.length === 0) return void 0;
-  const rates = { currency: currency2 };
-  for (const raw of components) {
-    if (!isObject(raw) || Object.keys(raw).some((key2) => !["type", "price", "stepSize"].includes(key2))) return void 0;
-    const type = raw["type"], value = raw["price"], step = raw["stepSize"];
-    if (!isNumber(value) || Decimal.parse(asText(value)).mantissa < 0n || typeof step !== "number" || !Number.isSafeInteger(step) || step < 1) return void 0;
-    const field = type === "ENERGY" ? "energyPerKWh" : type === "FLAT" ? "flatFee" : type === "TIME" ? "timePerHour" : void 0;
-    if (field === void 0 || rates[field] !== void 0) return void 0;
-    rates[field] = asText(value);
-  }
-  return rates;
-}
 function verifySessionPriceEvidence(current, value, request, policy = {}) {
   if (!(current instanceof TrustContext) && !(current instanceof HistoricalTrustContext)) throw new POIError("Session prices require current local authorization");
   if (!Number.isFinite(request.chargingStarted) || request.chargingStarted > current.evaluatedAt || !isLowerHex(request.startDocumentSHA256, 32)) throw new POIError("Invalid original price context");
@@ -17240,7 +17751,7 @@ function verifySessionPriceEvidence(current, value, request, policy = {}) {
   if (selected === void 0) throw new POIError("Missing selected price");
   const currency2 = requireString(selected.tariff, "currency"), elements = requireArray(selected.price["elements"], "Signed price elements").map((item) => requireObject(item, "A signed price element")), rates = grossRates(currency2, elements);
   let applicability = agreement === void 0 ? "unbound" : "bound";
-  if (agreement !== void 0 && (agreement.json["chargingMode"] !== "adhoc" || agreement.json["priceBinding"] !== "fixed-at-start" || agreement.json["pricingProfile"] !== SIMPLE_GROSS_PRICE_PROFILE || rates === void 0)) {
+  if (agreement !== void 0 && (agreement.json["pricingProfile"] !== GROSS_PRICE_PROFILES.get(asText(agreement.json["chargingMode"])) || agreement.json["priceBinding"] !== "fixed-at-start" || rates === void 0)) {
     applicability = "unsupported";
     diagnostics.push("EMP/contract terms, variable binding, unknown price profile or conditional elements are not established by this profile");
   }
@@ -17315,7 +17826,7 @@ function verifySessionPriceEvidence(current, value, request, policy = {}) {
     diagnostics,
     checkpointIds,
     witnessedBy: [...witnessed],
-    selected: { statement: selected.statement.json, digest: selected.digest, tariff: selected.tariff, currency: currency2, elements, ...rates === void 0 || agreement?.json["pricingProfile"] !== SIMPLE_GROSS_PRICE_PROFILE ? {} : { rates } }
+    selected: { statement: selected.statement.json, digest: selected.digest, tariff: selected.tariff, currency: currency2, elements, ...rates === void 0 || ![...GROSS_PRICE_PROFILES.values()].includes(asText(agreement?.json["pricingProfile"])) ? {} : { rates } }
   };
 }
 
@@ -17761,6 +18272,6 @@ function applyVerifiedTrustTransition(before, verified, at) {
 }
 var initialTrustEpoch = () => ({ number: 1, profiles: EpochProfiles.FIRST });
 
-export { ATTESTATION_CONTEXT, ArchiveSegment, Attestation, CHANGE_SET_CONTEXT, CHARGING_DOCUMENT_USAGE, CHECKPOINT_CONTEXT2 as CHECKPOINT_CONTEXT, CHILD_ARRAYS, COMMIT_CONTEXT2 as COMMIT_CONTEXT, CONTEXT_PREFIX, ChangeSet, ChargingStationProof, Checkpoint, CheckpointProof, Commit, DCCMeasurementResult, DCCResult, DCCStatement, DCC_PERFORMANCE_LOCATIONS, DCOC_MODULES, DDoCNotifiedBody, Decimal, DigitalCalibrationCertificate, DigitalCertificateOfConformity, DigitalDeclarationOfConformity, EPOCH_CONTEXT, EPOCH_LINK_CONTEXT, EPOCH_PROFILES_CONTEXT, EVTalerAmountChecks, EVTalerContractTerms, EVTalerCovers, EVTalerPayURI, EVTalerRates, EVTalerSettlement, EVTalerSignedMeterValue, EVTalerStep, EV_TALER_EXCHANGE_CONTEXT, EV_TALER_MERCHANT_CONTEXT, EV_TALER_PAYMENT_MEANS, EV_TALER_PAYMENT_OPTION, EV_TALER_SETTLEMENT_CONTEXT, EV_TALER_STEP_CONTEXT, EpochProfiles, FIRST_EPOCH, HISTORICAL_METER_EVIDENCE_CONTEXT, HistoricalTrustContext, History, KEY_STATEMENT_CONTEXT, KeyStatement, KeyUsages, LIVE_TOPICS, MAX_DECIMAL_SCALE, MAX_PRICE_STATEMENT_SEQUENCE, MERGE_CHANGE_SET_ID_PREFIX, MeasurementKeyError, NetDecimal, OperatorTrust, POIClient, POIError, POIPublicKey, PRICE_PUBLICATION_RECEIPT_CONTEXT, PROOF_CONTEXT, PricePublicationReceipt, PriceStatement, PriceStatementProof, QIDigitalDocument, QIDigitalItem, QIDigitalLegislation, QIDigitalManufacturer, QIDigitalModel, QIDigitalPerson, QIDigitalQuantity, QIDigitalSignature, QIDigitalStandard, QI_DIGITAL_CONFORMITIES, ROAMING_NETWORK_CONTEXT, RUNTIME_STATUS_KINDS, RoamingNetwork, RoamingNetworkOperator, RuntimeStatus, SESSION_PRICE_AGREEMENT_CONTEXT, SESSION_PRICE_EVIDENCE_CONTEXT, SIGNATURE_ALGORITHMS, SIGNING_KEY_CERTIFICATE_CONTEXT, SIMPLE_GROSS_PRICE_PROFILE, STATUS_UPDATE_CONTEXT, STYX_CANONICAL_JSON, SessionPriceAgreement, SignatureRoles, SigningKeyCertificate, TRUST_ANCHOR_CONTEXT, TRUST_ANCHOR_QR_PREFIX, TRUST_TRANSITION_CONTEXT, TrustAnchor, TrustContext, TrustTransition, VerifiedTrustTransition, WITNESS_PUBLICATION_POLICY_CONTEXT, applyChangeSet, applyVerifiedTrustTransition, approvesQualitySystem, auditPath, canonicalJSON, canonicalJSONBytes, canonicalString, cborETag, cborToJson, changeSetIdentification, check, checkOwnership, checkpointRootVersionObservation, checkpointVersionObservation, clone, commitsRoot, compareObservedVersions, decodeDeterministicCbor, describeVersion, deterministicCbor, effectiveChargingStationOperator, effectiveContent, effectiveTreeETag, emptyObservedVersions, entityDigest, etagToJSON, etagToText, evTalerExchangesAt, evTalerMerchantOf, evTalerTariff, evTalerTariffOf, fromBase45, fromBase64, fromHex, fromJavaScript, get, givesCompletely, hash, historicalOperatorContext, initialTrustEpoch, isArray, isEVTalerSessionId, isObject, isTalerPublicKey, jsonETag, jsonToCbor, keyMaySignIn, leafHash, liveRequest, merkleRoot, merkleRootOfLeafHashes, minorUnitDigits, nodeHash, observedVersionsChecksum, parseArchiveSegmentInfo, parseETag, parseETags, parseEpoch, parseEpochLink, parseEvidence, parseFrame, parseHistoricalMeterEvidence, parseJSON, parseJSONBytes, parseJSONObject, parseMeasurementPublicKey, parsePriceStatements, parseSessionPriceEvidence, parseStatusUpdate, parseTimestamp, parseTrustedWitnesses, parseWitnessPublicationPolicy, paymentOptionName, prettyJSON, pricePublicationOfferHashes, priceStatementChainOf, priceStatementsRoot, priceVersionObservation, prunedTree, publicPublicationURL, qiDigitalContext, rootFromAuditPath, roundToNearest, roundUp, sameBaseURL, sameETag, sameETags, sameEpoch, sameValue, sizeOf, skeleton, stationVersionObservation, subscribeRequest, talerAmountOf, toBase45, toBase64, toHex, toTimestamp, trustPolicyId, trustStatementDigest, verifyAuthorizedCheckpoint, verifyChargingDocumentKeys, verifyChargingStation, verifyCheckpointLine, verifyCheckpointPriceStatements, verifyCheckpointSignatures, verifyEvidence, verifyHistoricalMeterEvidence, verifyMeterKey, verifyMeterValue, verifyPricePublication, verifyPriceStatementChain, verifyPriceStatements, verifySegmentLine, verifySessionPriceEvidence, verifySignature, verifyVersion, writeAmount, writeDecimal };
+export { ATTESTATION_CONTEXT, ArchiveSegment, Attestation, CHANGE_SET_CONTEXT, CHARGING_DOCUMENT_USAGE, CHECKPOINT_CONTEXT2 as CHECKPOINT_CONTEXT, CHILD_ARRAYS, COMMIT_CONTEXT2 as COMMIT_CONTEXT, CONTEXT_PREFIX, CONTRACT_GROSS_PRICE_PROFILE, ChangeSet, ChargingStationProof, Checkpoint, CheckpointProof, Commit, DCCMeasurementResult, DCCResult, DCCStatement, DCC_PERFORMANCE_LOCATIONS, DCOC_MODULES, DDoCNotifiedBody, Decimal, DigitalCalibrationCertificate, DigitalCertificateOfConformity, DigitalDeclarationOfConformity, EPOCH_CONTEXT, EPOCH_LINK_CONTEXT, EPOCH_PROFILES_CONTEXT, EVTalerAmountChecks, EVTalerContractTerms, EVTalerCovers, EVTalerPayURI, EVTalerRates, EVTalerSettlement, EVTalerSignedMeterValue, EVTalerStep, EV_TALER_EXCHANGE_CONTEXT, EV_TALER_MERCHANT_CONTEXT, EV_TALER_PAYMENT_MEANS, EV_TALER_PAYMENT_OPTION, EV_TALER_SETTLEMENT_CONTEXT, EV_TALER_STEP_CONTEXT, EpochProfiles, FIRST_EPOCH, HISTORICAL_METER_EVIDENCE_CONTEXT, HistoricalTrustContext, History, KEY_STATEMENT_CONTEXT, KeyStatement, KeyUsages, LIVE_TOPICS, MAX_DECIMAL_SCALE, MAX_PRICE_STATEMENT_SEQUENCE, MERGE_CHANGE_SET_ID_PREFIX, MeasurementKeyError, NetDecimal, OperatorTrust, POIClient, POIError, POIPublicKey, PRICE_PUBLICATION_RECEIPT_CONTEXT, PROOF_CONTEXT, PricePublicationReceipt, PriceStatement, PriceStatementProof, QIDigitalDocument, QIDigitalItem, QIDigitalLegislation, QIDigitalManufacturer, QIDigitalModel, QIDigitalPerson, QIDigitalQuantity, QIDigitalSignature, QIDigitalStandard, QI_DIGITAL_CONFORMITIES, ROAMING_NETWORK_CONTEXT, RUNTIME_STATUS_KINDS, RoamingNetwork, RoamingNetworkOperator, RuntimeStatus, SESSION_PRICE_AGREEMENT_CONTEXT, SESSION_PRICE_EVIDENCE_CONTEXT, SIGNATURE_ALGORITHMS, SIGNING_KEY_CERTIFICATE_CONTEXT, SIMPLE_GROSS_PRICE_PROFILE, STATUS_UPDATE_CONTEXT, STYX_CANONICAL_JSON, SessionPriceAgreement, SignatureRoles, SigningKeyCertificate, TRUST_ANCHOR_CONTEXT, TRUST_ANCHOR_QR_PREFIX, TRUST_TRANSITION_CONTEXT, TrustAnchor, TrustContext, TrustTransition, VerifiedTrustTransition, WITNESS_PUBLICATION_POLICY_CONTEXT, applyChangeSet, applyVerifiedTrustTransition, approvesQualitySystem, auditPath, canonicalJSON, canonicalJSONBytes, canonicalString, cborETag, cborToJson, changeSetIdentification, check, checkOwnership, checkpointRootVersionObservation, checkpointVersionObservation, clone, commitsRoot, compareObservedVersions, decodeDeterministicCbor, describeVersion, deterministicCbor, effectiveChargingStationOperator, effectiveContent, effectiveTreeETag, emptyObservedVersions, entityDigest, etagToJSON, etagToText, evTalerExchangesAt, evTalerMerchantOf, evTalerSessionPrices, evTalerTariff, evTalerTariffOf, fromBase45, fromBase64, fromHex, fromJavaScript, get, givesCompletely, hash, historicalOperatorContext, initialTrustEpoch, isArray, isEVTalerSessionId, isObject, isTalerPublicKey, jsonETag, jsonToCbor, keyMaySignIn, leafHash, liveRequest, merkleRoot, merkleRootOfLeafHashes, minorUnitDigits, nodeHash, observedVersionsChecksum, parseArchiveSegmentInfo, parseETag, parseETags, parseEpoch, parseEpochLink, parseEvidence, parseFrame, parseHistoricalMeterEvidence, parseJSON, parseJSONBytes, parseJSONObject, parseMeasurementPublicKey, parsePriceStatements, parseSessionPriceEvidence, parseStatusUpdate, parseTimestamp, parseTrustedWitnesses, parseWitnessPublicationPolicy, paymentOptionName, prettyJSON, pricePublicationOfferHashes, priceStatementChainOf, priceStatementsRoot, priceVersionObservation, prunedTree, publicPublicationURL, qiDigitalContext, rootFromAuditPath, roundToNearest, roundUp, sameBaseURL, sameETag, sameETags, sameEpoch, sameValue, sizeOf, skeleton, stationVersionObservation, subscribeRequest, talerAmountOf, toBase45, toBase64, toHex, toTimestamp, trustPolicyId, trustStatementDigest, verifyAuthorizedCheckpoint, verifyChargingDocumentKeys, verifyChargingStation, verifyCheckpointLine, verifyCheckpointPriceStatements, verifyCheckpointSignatures, verifyEvidence, verifyHistoricalMeterEvidence, verifyMeterKey, verifyMeterValue, verifyPricePublication, verifyPriceStatementChain, verifyPriceStatements, verifySegmentLine, verifySessionPriceEvidence, verifySignature, verifyVersion, writeAmount, writeDecimal };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map