@lblod/ember-rdfa-editor-lblod-plugins 32.8.0 → 33.0.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 33.0.0
+
+### Major Changes
+
+- [#604](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/604) [`6299352`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/629935200df1c15d3094483465dcffc734daf55c) Thanks [@elpoelma](https://github.com/elpoelma)! - Increase `@lblod/ember-rdfa-editor` peerdep requirement to version [12.5.0](https://github.com/lblod/ember-rdfa-editor/releases/tag/%40lblod%2Fember-rdfa-editor%4012.15.0)
+  This versions contains `block_rdfa` support for model migrations.
+
+### Minor Changes
+
+- [#607](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/607) [`9032503`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/903250362f411c8c1f49912deb60f80f09c0ef89) Thanks [@piemonkey](https://github.com/piemonkey)! - Update RDFa output of roadsign-regulation-plugin to more closely match the data model
+
+### Patch Changes
+
+- [#604](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/604) [`cf02699`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/cf02699ef6e7811195546eaf9d4c98a873d08ab3) Thanks [@elpoelma](https://github.com/elpoelma)! - Update zonality concept URIs based on new URI bases
+
 ## 32.8.0
 
 ### Minor Changes

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -43,7 +43,10 @@ type Option = {
   label: string;
 };
 
-type Zonality = Option;
+type Zonality = {
+  uri: (typeof ZONALITY_OPTIONS)[keyof typeof ZONALITY_OPTIONS];
+  label: string;
+};
 type TypeOption = Option;
 type Code = Option;
 type Category = Option;

package/addon/components/variable-plugin/location/edit.ts

@@ -12,7 +12,10 @@ import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { trackedFunction } from 'reactiveweb/function';
 import { updateCodelistVariable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/codelist-utils';
 import { tracked } from '@glimmer/tracking';
-import { ZONALITY_OPTIONS } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import {
+  ZONALITY_OPTIONS,
+  ZONALITY_OPTIONS_LEGACY,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import {
   getOutgoingTriple,
   hasOutgoingNamedNodeTriple,
@@ -109,7 +112,10 @@ export default class LocationEditComponent extends Component<Args> {
     if (!zonalityTriple) {
       return false;
     }
-    return zonalityTriple.object.value === ZONALITY_OPTIONS.ZONAL;
+    return (
+      zonalityTriple.object.value === ZONALITY_OPTIONS.ZONAL ||
+      zonalityTriple.object.value === ZONALITY_OPTIONS_LEGACY.ZONAL
+    );
   }
 
   locationOptions = trackedFunction(this, async () => {

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -108,14 +108,19 @@ export default function insertMeasure({
             object: sayDataFactory.namedNode(measureConcept.uri),
           },
           {
-            //TODO: not sure about this predicate...
+            // TODO this should be replaced by MOBILITEIT('zone'), but we need to know what to
+            // actually link this to as we have no way to specify zones
             predicate: EXT('zonality').full,
             object: sayDataFactory.namedNode(zonality),
           },
           {
             predicate: DCT('description').full,
-            object: sayDataFactory.contentLiteral(),
+            object: sayDataFactory.contentLiteral('nl-BE'),
           },
+          // TODO there are some properties that are missing from the measure that we should define if we can:
+          // locn:address, mobiliteit:contactorganisatie, mobiliteit:doelgroep, adms:identifier,
+          // mobiliteit:periode, mobiliteit:plaatsbepaling, schema:eventSchedule, mobiliteit:type,
+          // mobiliteit:verwijstNaar, mobiliteit:heeftGevolg
         ],
       },
       [measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
@@ -244,6 +249,8 @@ function constructSignNode(
           predicate: PROV('wasDerivedFrom').full,
           object: sayDataFactory.namedNode(signConcept.uri),
         },
+        // TODO should include extra Verkeersteken properties? mobiliteit:heeftOnderbord,
+        // mobiliteit:isBeginZone, mobiliteit:isEindeZone?
       ],
     },
     schema.text(

package/addon/plugins/roadsign-regulation-plugin/constants.ts

@@ -1,13 +1,59 @@
 import { MOBILITEIT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import { ValueOf } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 
 export const ZONALITY_OPTIONS = {
+  POTENTIALLY_ZONAL:
+    'http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f',
+  ZONAL:
+    'http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d',
+  NON_ZONAL:
+    'http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc',
+} as const;
+
+export const ZONALITY_OPTIONS_LEGACY = {
   POTENTIALLY_ZONAL:
     'http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f',
   ZONAL: 'http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d',
   NON_ZONAL:
     'http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc',
 } as const;
+
+export type ZonalityUri = ValueOf<typeof ZONALITY_OPTIONS>;
+export type LegacyZonalityUri = ValueOf<typeof ZONALITY_OPTIONS_LEGACY>;
+
+export function getLegacyZonalityUri(uri: ZonalityUri | LegacyZonalityUri) {
+  if (isLegacyZonalityUri(uri)) {
+    return uri;
+  }
+  const key = (
+    Object.keys(ZONALITY_OPTIONS) as (keyof typeof ZONALITY_OPTIONS)[]
+  ).find((k) => ZONALITY_OPTIONS[k] === uri) as keyof typeof ZONALITY_OPTIONS;
+  return ZONALITY_OPTIONS_LEGACY[key];
+}
+
+export function getNewZonalityUri(uri: ZonalityUri | LegacyZonalityUri) {
+  if (isNewZonalityUri(uri)) {
+    return uri;
+  }
+  const key = (
+    Object.keys(ZONALITY_OPTIONS_LEGACY) as (keyof typeof ZONALITY_OPTIONS)[]
+  ).find(
+    (k) => ZONALITY_OPTIONS_LEGACY[k] === uri,
+  ) as keyof typeof ZONALITY_OPTIONS_LEGACY;
+  return ZONALITY_OPTIONS[key];
+}
+
+export function isNewZonalityUri(uri: string): uri is ZonalityUri {
+  // @ts-expect-error not sure how to handle this correctly
+  return Object.values(ZONALITY_OPTIONS).includes(uri);
+}
+
+export function isLegacyZonalityUri(uri: string): uri is LegacyZonalityUri {
+  // @ts-expect-error not sure how to handle this correctly
+  return Object.values(ZONALITY_OPTIONS_LEGACY).includes(uri);
+}
+
 export type ZonalityOption = ValuesOf<typeof ZONALITY_OPTIONS>;
 export type ZonalOrNot = Exclude<
   ZonalityOption,

package/addon/plugins/roadsign-regulation-plugin/nodes.ts

@@ -27,7 +27,11 @@ import {
   ModelMigrationGenerator,
 } from '@lblod/ember-rdfa-editor/core/rdfa-types';
 import { getRdfaContentElement } from '@lblod/ember-rdfa-editor/core/schema';
-import { TRAFFIC_SIGNAL_TYPES } from './constants';
+import {
+  getNewZonalityUri,
+  isLegacyZonalityUri,
+  TRAFFIC_SIGNAL_TYPES,
+} from './constants';
 
 const CONTENT_SELECTOR = `div[property~='${
   DCT('description').full
@@ -41,13 +45,10 @@ export const roadsign_regulation: NodeSpec = {
     resourceUri: {},
     measureUri: {},
     zonality: {},
-    temporal: {
-      default: false,
-    },
   },
   classNames: ['say-roadsign-regulation'],
   toDOM(node: PNode) {
-    const { resourceUri, measureUri, zonality, temporal } = node.attrs;
+    const { resourceUri, measureUri, zonality } = node.attrs;
     return [
       'div',
       {
@@ -68,18 +69,21 @@ export const roadsign_regulation: NodeSpec = {
         'span',
         {
           style: 'display:none;',
+          // TODO this should be replaced by MOBILITEIT('zone'), but we need to know what to
+          // actually link this to as we have no way to specify zones
           property: EXT('zonality'),
           resource: zonality as string,
         },
       ],
       [
-        'span',
+        'div',
         {
-          property: EXT('temporal'),
-          resource: (temporal as string) ?? false,
+          property: DCT('description'),
+          datatype: RDF('langString'),
+          lang: 'nl-BE',
         },
+        0,
       ],
-      ['div', { property: DCT('description') }, 0],
     ];
   },
   parseDOM: [
@@ -140,7 +144,7 @@ export const roadsign_regulation: NodeSpec = {
   ],
 };
 
-const replacements = [
+const trafficSignalRDFTypeReplacements = [
   [MOBILITEIT('Verkeersbord-Verkeersteken'), TRAFFIC_SIGNAL_TYPES.ROAD_SIGN],
   [
     MOBILITEIT('Verkeerslicht-Verkeersteken'),
@@ -154,7 +158,7 @@ const replacements = [
  **/
 export const trafficSignalMigration: ModelMigrationGenerator = (attrs) => {
   const factory = new SayDataFactory();
-  for (const [source, replacement] of replacements) {
+  for (const [source, replacement] of trafficSignalRDFTypeReplacements) {
     const conceptTriple = getOutgoingTriple(
       attrs,
       MOBILITEIT('heeftVerkeersbordconcept'),
@@ -198,3 +202,42 @@ export const trafficSignalMigration: ModelMigrationGenerator = (attrs) => {
   }
   return false;
 };
+
+export const trafficMeasureZonalityMigration: ModelMigrationGenerator = (
+  attrs,
+) => {
+  const factory = new SayDataFactory();
+
+  if (
+    !isResourceAttrs(attrs) ||
+    !hasOutgoingNamedNodeTriple(
+      attrs,
+      RDF('type'),
+      MOBILITEIT('Mobiliteitsmaatregel'),
+    )
+  ) {
+    return false;
+  }
+  const zonalityTriple = getOutgoingTriple(attrs, EXT('zonality'));
+  if (!zonalityTriple) {
+    return false;
+  }
+  if (!isLegacyZonalityUri(zonalityTriple.object.value)) {
+    return false;
+  }
+  const newZonalityProp = {
+    predicate: EXT('zonality').full,
+    object: factory.namedNode(getNewZonalityUri(zonalityTriple.object.value)),
+  };
+  const newProps = attrs.properties
+    .filter((prop) => !EXT('zonality').matches(prop.predicate))
+    .concat([newZonalityProp]);
+  return {
+    getAttrs: () => {
+      return {
+        ...attrs,
+        properties: newProps,
+      };
+    },
+  } satisfies ModelMigration;
+};

package/addon/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept.ts

@@ -10,12 +10,18 @@ import {
 } from '../schemas/mobility-measure-concept';
 import { z } from 'zod';
 import { queryTrafficSignalConcepts } from './traffic-signal-concept';
-import { ZONALITY_OPTIONS } from '../constants';
+import {
+  getLegacyZonalityUri,
+  getNewZonalityUri,
+  LegacyZonalityUri,
+  ZONALITY_OPTIONS,
+  ZonalityUri,
+} from '../constants';
 
 type QueryOptions<Count extends boolean = boolean> = {
   imageBaseUrl?: string;
   searchString?: string;
-  zonality?: string;
+  zonality?: (typeof ZONALITY_OPTIONS)[keyof typeof ZONALITY_OPTIONS];
   trafficSignalType?: string;
   codes?: string[];
   category?: string;
@@ -37,7 +43,13 @@ function _buildFilters(
   const filters = [];
   if (zonality) {
     filters.push(
-      `FILTER(?zonality IN (${sparqlEscapeUri(zonality)}, ${sparqlEscapeUri(ZONALITY_OPTIONS.POTENTIALLY_ZONAL)}))`,
+      `FILTER(?zonality IN (
+        ${sparqlEscapeUri(zonality)},
+        ${sparqlEscapeUri(getLegacyZonalityUri(zonality))},
+        ${sparqlEscapeUri(ZONALITY_OPTIONS.POTENTIALLY_ZONAL)},
+        ${sparqlEscapeUri(getLegacyZonalityUri(ZONALITY_OPTIONS.POTENTIALLY_ZONAL))}
+        )
+      )`,
     );
   }
   if (trafficSignalType) {
@@ -137,6 +149,9 @@ async function _queryMobilityMeasures<Count extends boolean>(
           variableSignage:
             objectified.variableSignage === '1' ||
             objectified.variableSignage === 'true',
+          zonality: getNewZonalityUri(
+            objectified.zonality as ZonalityUri | LegacyZonalityUri,
+          ),
         };
       }),
     );

package/addon/plugins/roadsign-regulation-plugin/queries/traffic-signal-concept.ts

@@ -36,7 +36,6 @@ export async function queryTrafficSignalConcepts(
       ?type
       ?code
       ?regulatoryNotation
-      ?zonality
       ?image
       ?position
     WHERE {
@@ -67,10 +66,6 @@ export async function queryTrafficSignalConcepts(
         BIND(CONCAT(${sparqlEscapeString(imageBaseUrl ?? '')}, "/files/", ?imageId, "/download") AS ?image)
       }
 
-      OPTIONAL {
-        ?uri ext:zonality ?zonality.
-      }
-
       OPTIONAL  {
         ?uri ext:regulatoryNotation ?regulatoryNotation.
       }

package/addon/plugins/roadsign-regulation-plugin/schemas/traffic-signal-concept.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { TRAFFIC_SIGNAL_CONCEPT_TYPES, ZONALITY_OPTIONS } from '../constants';
+import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '../constants';
 import { RoadSignCategorySchema } from './road-sign-category';
 
 export const TrafficSignalConceptSchema = z
@@ -8,7 +8,6 @@ export const TrafficSignalConceptSchema = z
     code: z.string(),
     regulatoryNotation: z.string().optional(),
     image: z.string(),
-    zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
     position: z.coerce.number().default(-1),
   })
   .and(

package/addon/utils/types.ts

@@ -5,3 +5,5 @@ export type SafeString = ReturnType<typeof htmlSafe>;
 
 export type AllOrNone<T> = T | { [K in keyof T]?: never };
 export type ContentSpec = Fragment | PNode | PNode[];
+
+export type ValueOf<T> = T[keyof T];

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -4,12 +4,15 @@ import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { Select } from 'ember-power-select/components/power-select';
 import { TaskInstance } from 'reactiveweb/ember-concurrency';
-import { type ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { ZONALITY_OPTIONS, type ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 type Option = {
     uri: string;
     label: string;
 };
-type Zonality = Option;
+type Zonality = {
+    uri: (typeof ZONALITY_OPTIONS)[keyof typeof ZONALITY_OPTIONS];
+    label: string;
+};
 type TypeOption = Option;
 type Code = Option;
 type Category = Option;
@@ -83,8 +86,8 @@ export default class RoadsignsModal extends Component<Signature> {
         concepts: {
             label: string;
             uri: string;
-            zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
             preview: string;
+            zonality: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
             variableSignage: boolean;
             trafficSignalConcepts: ({
                 code: string;
@@ -92,7 +95,6 @@ export default class RoadsignsModal extends Component<Signature> {
                 uri: string;
                 position: number;
                 regulatoryNotation?: string | undefined;
-                zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
             } & ({
                 type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
                 categories: {
@@ -112,8 +114,8 @@ export default class RoadsignsModal extends Component<Signature> {
     get measureConcepts(): {
         label: string;
         uri: string;
-        zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
         preview: string;
+        zonality: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
         variableSignage: boolean;
         trafficSignalConcepts: ({
             code: string;
@@ -121,7 +123,6 @@ export default class RoadsignsModal extends Component<Signature> {
             uri: string;
             position: number;
             regulatoryNotation?: string | undefined;
-            zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
         } & ({
             type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
             categories: {

package/declarations/addon/plugins/roadsign-regulation-plugin/constants.d.ts

@@ -1,9 +1,21 @@
+import { ValueOf } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 import { ValuesOf } from '@lblod/ember-rdfa-editor/utils/_private/types';
 export declare const ZONALITY_OPTIONS: {
+    readonly POTENTIALLY_ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
+    readonly ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
+    readonly NON_ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
+};
+export declare const ZONALITY_OPTIONS_LEGACY: {
     readonly POTENTIALLY_ZONAL: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
     readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
     readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
 };
+export type ZonalityUri = ValueOf<typeof ZONALITY_OPTIONS>;
+export type LegacyZonalityUri = ValueOf<typeof ZONALITY_OPTIONS_LEGACY>;
+export declare function getLegacyZonalityUri(uri: ZonalityUri | LegacyZonalityUri): LegacyZonalityUri;
+export declare function getNewZonalityUri(uri: ZonalityUri | LegacyZonalityUri): ZonalityUri;
+export declare function isNewZonalityUri(uri: string): uri is ZonalityUri;
+export declare function isLegacyZonalityUri(uri: string): uri is LegacyZonalityUri;
 export type ZonalityOption = ValuesOf<typeof ZONALITY_OPTIONS>;
 export type ZonalOrNot = Exclude<ZonalityOption, typeof ZONALITY_OPTIONS.POTENTIALLY_ZONAL>;
 export declare const TRAFFIC_SIGNAL_CONCEPT_TYPES: {

package/declarations/addon/plugins/roadsign-regulation-plugin/nodes.d.ts

@@ -6,3 +6,4 @@ export declare const roadsign_regulation: NodeSpec;
  * namedNodes to encode everything in one inline_rdfa
  **/
 export declare const trafficSignalMigration: ModelMigrationGenerator;
+export declare const trafficMeasureZonalityMigration: ModelMigrationGenerator;

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/mobility-measure-concept.d.ts

@@ -1,7 +1,8 @@
+import { ZONALITY_OPTIONS } from '../constants';
 type QueryOptions<Count extends boolean = boolean> = {
     imageBaseUrl?: string;
     searchString?: string;
-    zonality?: string;
+    zonality?: (typeof ZONALITY_OPTIONS)[keyof typeof ZONALITY_OPTIONS];
     trafficSignalType?: string;
     codes?: string[];
     category?: string;
@@ -14,8 +15,8 @@ export type MobilityMeasureQueryOptions = Omit<QueryOptions, 'count'>;
 export declare function queryMobilityMeasures(endpoint: string, options?: MobilityMeasureQueryOptions): Promise<{
     label: string;
     uri: string;
-    zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
+    zonality: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     variableSignage: boolean;
     trafficSignalConcepts: ({
         code: string;
@@ -23,7 +24,6 @@ export declare function queryMobilityMeasures(endpoint: string, options?: Mobili
         uri: string;
         position: number;
         regulatoryNotation?: string | undefined;
-        zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     } & ({
         type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
         categories: {

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/traffic-signal-concept.d.ts

@@ -9,7 +9,6 @@ export declare function queryTrafficSignalConcepts(endpoint: string, options: Qu
     uri: string;
     position: number;
     regulatoryNotation?: string | undefined;
-    zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
 } & {
     type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
 }) | {
@@ -22,7 +21,6 @@ export declare function queryTrafficSignalConcepts(endpoint: string, options: Qu
     uri: string;
     position: number;
     regulatoryNotation?: string | undefined;
-    zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
 })[]>;
 export {};

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept.d.ts

@@ -4,9 +4,9 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
     label: z.ZodString;
     preview: z.ZodString;
     zonality: z.ZodNativeEnum<{
-        readonly POTENTIALLY_ZONAL: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
-        readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
-        readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
+        readonly POTENTIALLY_ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
+        readonly ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
+        readonly NON_ZONAL: "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     }>;
     variableSignage: z.ZodDefault<z.ZodBoolean>;
     trafficSignalConcepts: z.ZodDefault<z.ZodArray<z.ZodIntersection<z.ZodObject<{
@@ -14,11 +14,6 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         code: z.ZodString;
         regulatoryNotation: z.ZodOptional<z.ZodString>;
         image: z.ZodString;
-        zonality: z.ZodOptional<z.ZodNativeEnum<{
-            readonly POTENTIALLY_ZONAL: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
-            readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
-            readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
-        }>>;
         position: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         code: string;
@@ -26,14 +21,12 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         uri: string;
         position: number;
         regulatoryNotation?: string | undefined;
-        zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     }, {
         code: string;
         image: string;
         uri: string;
         position?: number | undefined;
         regulatoryNotation?: string | undefined;
-        zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
         categories: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -68,8 +61,8 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     label: string;
     uri: string;
-    zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
+    zonality: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     variableSignage: boolean;
     trafficSignalConcepts: ({
         code: string;
@@ -77,7 +70,6 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         uri: string;
         position: number;
         regulatoryNotation?: string | undefined;
-        zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     } & ({
         type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
         categories: {
@@ -90,8 +82,8 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
 }, {
     label: string;
     uri: string;
-    zonality: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     preview: string;
+    zonality: "http://register.mobiliteit.vlaanderen.be/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://register.mobiliteit.vlaanderen.be/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://register.mobiliteit.vlaanderen.be/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     variableSignage?: boolean | undefined;
     trafficSignalConcepts?: ({
         code: string;
@@ -99,7 +91,6 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         uri: string;
         position?: number | undefined;
         regulatoryNotation?: string | undefined;
-        zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
     } & ({
         type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
         categories?: {

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/traffic-signal-concept.d.ts

@@ -4,11 +4,6 @@ export declare const TrafficSignalConceptSchema: z.ZodIntersection<z.ZodObject<{
     code: z.ZodString;
     regulatoryNotation: z.ZodOptional<z.ZodString>;
     image: z.ZodString;
-    zonality: z.ZodOptional<z.ZodNativeEnum<{
-        readonly POTENTIALLY_ZONAL: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f";
-        readonly ZONAL: "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d";
-        readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
-    }>>;
     position: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     code: string;
@@ -16,14 +11,12 @@ export declare const TrafficSignalConceptSchema: z.ZodIntersection<z.ZodObject<{
     uri: string;
     position: number;
     regulatoryNotation?: string | undefined;
-    zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
 }, {
     code: string;
     image: string;
     uri: string;
     position?: number | undefined;
     regulatoryNotation?: string | undefined;
-    zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
 }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
     categories: z.ZodDefault<z.ZodArray<z.ZodObject<{

package/declarations/addon/utils/types.d.ts

@@ -5,3 +5,4 @@ export type AllOrNone<T> = T | {
     [K in keyof T]?: never;
 };
 export type ContentSpec = Fragment | PNode | PNode[];
+export type ValueOf<T> = T[keyof T];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "32.8.0",
+  "version": "33.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -112,7 +112,7 @@
     "@glint/template": "^1.5.0",
     "@graphy/content.ttl.write": "^4.3.7",
     "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "12.14.0",
+    "@lblod/ember-rdfa-editor": "12.15.1",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -183,7 +183,7 @@
     "@appuniversum/ember-appuniversum": "^3.12.0",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^12.12.1",
+    "@lblod/ember-rdfa-editor": "^12.15.0",
     "ember-concurrency": "^4.0.2",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",