@lblod/ember-rdfa-editor-lblod-plugins 33.1.0 → 33.2.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 33.2.0
+
+### Minor Changes
+
+- [#609](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/609) [`600774b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/600774bf0e678850daa2ad1c848241403eb48b6f) Thanks [@elpoelma](https://github.com/elpoelma)! - roadsign-regulation-plugin: add support for inserting mobility-measures based on VKS measure-designs
+
+- [#612](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/612) [`7aa62a0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/7aa62a00aa3706fcdd37944fad5613bd8a94bc57) Thanks [@piemonkey](https://github.com/piemonkey)! - Only display structure borders when within the editor
+
 ## 33.1.0
 
 ### Minor Changes

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

@@ -38,30 +38,50 @@ import { createNumberVariable } from '../../variable-plugin/actions/create-numbe
 import { createDateVariable } from '../../variable-plugin/actions/create-date-variable';
 import { createCodelistVariable } from '../../variable-plugin/actions/create-codelist-variable';
 import { createClassicLocationVariable } from '../../variable-plugin/actions/create-classic-location-variable';
+import { isTrafficSignal, TrafficSignal } from '../schemas/traffic-signal';
+import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
+import {
+  isVariableInstance,
+  VariableInstance,
+} from '../schemas/variable-instance';
 
-interface InsertMeasureArgs {
-  measureConcept: MobilityMeasureConcept;
+type InsertMeasureArgs = {
   zonality: ZonalOrNot;
   temporal: boolean;
-  variables: Record<string, Exclude<Variable, { type: 'instruction' }>>;
+  variables: Record<
+    string,
+    Exclude<Variable, { type: 'instruction' }> | VariableInstance
+  >;
   templateString: string;
   decisionUri: string;
   articleUriGenerator?: () => string;
-}
+} & (
+  | {
+      measureConcept: MobilityMeasureConcept;
+    }
+  | {
+      measureDesign: MobilityMeasureDesign;
+    }
+);
 
 export default function insertMeasure({
-  measureConcept,
   zonality,
   temporal,
   variables,
   templateString,
   articleUriGenerator,
   decisionUri,
+  ...args
 }: InsertMeasureArgs): TransactionMonad<boolean> {
   return function (state: EditorState) {
+    const measureConcept =
+      'measureConcept' in args
+        ? args.measureConcept
+        : args.measureDesign.measureConcept;
+    const measureDesign = 'measureDesign' in args && args.measureDesign;
     const { schema } = state;
     const signNodes = measureConcept.trafficSignalConcepts.map((signConcept) =>
-      constructSignNode(signConcept, schema, zonality),
+      constructSignalNode(signConcept, schema, zonality),
     );
     let signSection: PNode[] = [];
     if (signNodes.length) {
@@ -117,6 +137,14 @@ export default function insertMeasure({
             predicate: DCT('description').full,
             object: sayDataFactory.contentLiteral('nl-BE'),
           },
+          ...(measureDesign
+            ? [
+                {
+                  predicate: MOBILITEIT('isGebaseerdOpMaatregelOntwerp'),
+                  object: sayDataFactory.namedNode(measureDesign.uri),
+                },
+              ]
+            : []),
           // 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,
@@ -172,7 +200,10 @@ export default function insertMeasure({
 
 function constructMeasureBody(
   templateString: string,
-  variables: Record<string, Exclude<Variable, { type: 'instruction' }>>,
+  variables: Record<
+    string,
+    Exclude<Variable, { type: 'instruction' }> | VariableInstance
+  >,
   schema: Schema,
 ) {
   const parts = templateString.split(/(\$\{[^{}$]+\})/);
@@ -216,13 +247,18 @@ function determineSignLabel(signConcept: TrafficSignalConcept) {
   }
 }
 
-function constructSignNode(
-  signConcept: TrafficSignalConcept,
+function constructSignalNode(
+  signalOrSignalConcept: TrafficSignal | TrafficSignalConcept,
   schema: Schema,
   zonality?: ZonalOrNot,
 ) {
-  const signUri = `http://data.lblod.info/verkeerstekens/${uuid()}`;
-  const prefix = determineSignLabel(signConcept);
+  const signalConcept = isTrafficSignal(signalOrSignalConcept)
+    ? signalOrSignalConcept.trafficSignalConcept
+    : signalOrSignalConcept;
+  const signalUri = isTrafficSignal(signalOrSignalConcept)
+    ? signalOrSignalConcept.uri
+    : `http://data.lblod.info/verkeerstekens/${uuid()}`;
+  const prefix = determineSignLabel(signalConcept);
   const zonalityText =
     !zonality || zonality !== ZONALITY_OPTIONS.ZONAL
       ? ''
@@ -232,7 +268,7 @@ function constructSignNode(
   const node = schema.nodes.inline_rdfa.create(
     {
       rdfaNodeType: 'resource',
-      subject: signUri,
+      subject: signalUri,
       __rdfaId: uuid(),
       properties: [
         {
@@ -242,33 +278,48 @@ function constructSignNode(
         {
           predicate: RDF('type').full,
           object: sayDataFactory.namedNode(
-            TRAFFIC_SIGNAL_TYPE_MAPPING[signConcept.type],
+            TRAFFIC_SIGNAL_TYPE_MAPPING[signalConcept.type],
           ),
         },
         {
           predicate: PROV('wasDerivedFrom').full,
-          object: sayDataFactory.namedNode(signConcept.uri),
+          object: sayDataFactory.namedNode(signalOrSignalConcept.uri),
         },
         // TODO should include extra Verkeersteken properties? mobiliteit:heeftOnderbord,
         // mobiliteit:isBeginZone, mobiliteit:isEindeZone?
       ],
     },
     schema.text(
-      `${prefix} ${signConcept.regulatoryNotation || signConcept.code}${zonalityText}`,
+      `${prefix} ${signalConcept.regulatoryNotation || signalConcept.code}${zonalityText}`,
     ),
   );
   return node;
 }
 
 function constructVariableNode(
-  variable: Exclude<Variable, { type: 'instruction' }>,
+  variableOrVariableInstance:
+    | Exclude<Variable, { type: 'instruction' }>
+    | VariableInstance,
   schema: Schema,
 ) {
-  const variableInstance = generateVariableInstanceUri();
+  const variable = isVariableInstance(variableOrVariableInstance)
+    ? variableOrVariableInstance.variable
+    : variableOrVariableInstance;
+  const variableInstance = isVariableInstance(variableOrVariableInstance)
+    ? variableOrVariableInstance
+    : {
+        uri: generateVariableInstanceUri(),
+        value: undefined,
+      };
+  const valueStr =
+    variableInstance.value instanceof Date
+      ? variableInstance.value.toISOString()
+      : variableInstance.value?.toString();
   const args = {
     schema,
     variable: variable.uri,
-    variableInstance,
+    variableInstance: variableInstance.uri,
+    value: valueStr,
     label: variable.label,
   };
   switch (variable.type) {

package/addon/plugins/roadsign-regulation-plugin/schemas/mobility-measure-design.ts

@@ -0,0 +1,20 @@
+import { z } from 'zod';
+import { TrafficSignalSchema } from './traffic-signal';
+import {
+  type MobilityMeasureConcept,
+  MobilityMeasureConceptSchema,
+} from './mobility-measure-concept';
+
+export const MobilityMeasureDesignSchema = z.object({
+  uri: z.string(),
+  trafficSignals: z.array(TrafficSignalSchema),
+  measureConcept: MobilityMeasureConceptSchema,
+});
+
+export type MobilityMeasureDesign = z.infer<typeof MobilityMeasureDesignSchema>;
+
+export function isMobilityMeasureDesign(
+  conceptOrDesign: MobilityMeasureConcept | MobilityMeasureDesign,
+): conceptOrDesign is MobilityMeasureDesign {
+  return 'measureConcept' in conceptOrDesign;
+}

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

@@ -0,0 +1,18 @@
+import { z } from 'zod';
+import {
+  TrafficSignalConcept,
+  TrafficSignalConceptSchema,
+} from './traffic-signal-concept';
+
+export const TrafficSignalSchema = z.object({
+  uri: z.string(),
+  trafficSignalConcept: TrafficSignalConceptSchema,
+});
+
+export type TrafficSignal = z.infer<typeof TrafficSignalSchema>;
+
+export function isTrafficSignal(
+  signalOrSignalConcept: TrafficSignal | TrafficSignalConcept,
+): signalOrSignalConcept is TrafficSignal {
+  return 'trafficSignalConcept' in signalOrSignalConcept;
+}

package/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.ts

@@ -0,0 +1,54 @@
+import { z } from 'zod';
+import {
+  CodelistVariableSchema,
+  DateVariableSchema,
+  LocationVariableSchema,
+  NumberVariableSchema,
+  TextVariableSchema,
+  Variable,
+} from './variable';
+
+const BaseVariableInstanceSchema = z.object({
+  uri: z.string(),
+});
+
+const TextVariableInstanceSchema = BaseVariableInstanceSchema.extend({
+  value: z.string().optional(),
+  variable: TextVariableSchema,
+});
+
+const NumberVariableInstanceSchema = BaseVariableInstanceSchema.extend({
+  value: z.number({ coerce: true }).optional(),
+  variable: NumberVariableSchema,
+});
+
+const DateVariableInstanceSchema = BaseVariableInstanceSchema.extend({
+  value: z.date({ coerce: true }).optional(),
+  variable: DateVariableSchema,
+});
+
+const LocationVariableInstanceSchema = BaseVariableInstanceSchema.extend({
+  value: z.string().optional(),
+  variable: LocationVariableSchema,
+});
+
+const CodelistVariableInstanceSchema = BaseVariableInstanceSchema.extend({
+  value: z.string().optional(),
+  variable: CodelistVariableSchema,
+});
+
+export const VariableInstanceSchema = z.union([
+  TextVariableInstanceSchema,
+  NumberVariableInstanceSchema,
+  DateVariableInstanceSchema,
+  LocationVariableInstanceSchema,
+  CodelistVariableInstanceSchema,
+]);
+
+export type VariableInstance = z.infer<typeof VariableInstanceSchema>;
+
+export function isVariableInstance(
+  variableOrVariableInstance: Variable | VariableInstance,
+): variableOrVariableInstance is VariableInstance {
+  return 'variable' in variableOrVariableInstance;
+}

package/addon/plugins/roadsign-regulation-plugin/schemas/variable.ts

@@ -5,33 +5,33 @@ const BaseVariableSchema = z.object({
   label: z.string(),
   source: z.string().optional(),
 });
-const TextVariableSchema = BaseVariableSchema.extend({
+export const TextVariableSchema = BaseVariableSchema.extend({
   type: z.literal('text'),
   defaultValue: z.string().optional(),
 });
 
-const NumberVariableSchema = BaseVariableSchema.extend({
+export const NumberVariableSchema = BaseVariableSchema.extend({
   type: z.literal('number'),
   defaultValue: z.number({ coerce: true }).optional(),
 });
 
-const DateVariableSchema = BaseVariableSchema.extend({
+export const DateVariableSchema = BaseVariableSchema.extend({
   type: z.literal('date'),
   defaultValue: z.date({ coerce: true }).optional(),
 });
 
-const CodelistVariableSchema = BaseVariableSchema.extend({
+export const CodelistVariableSchema = BaseVariableSchema.extend({
   type: z.literal('codelist'),
   defaultValue: z.string().optional(),
   codelistUri: z.string(),
 });
 
-const LocationVariableSchema = BaseVariableSchema.extend({
+export const LocationVariableSchema = BaseVariableSchema.extend({
   type: z.literal('location'),
   defaultValue: z.string().optional(),
 });
 
-const InstructionVariableSchema = BaseVariableSchema.extend({
+export const InstructionVariableSchema = BaseVariableSchema.extend({
   type: z.literal('instruction'),
 });
 

package/app/styles/structure-plugin.scss

@@ -1,4 +1,4 @@
-.say-structure {
+.say-editor .say-structure {
   border: 0.1rem solid var(--au-gray-300);
   border-radius: var(--au-radius);
 

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

@@ -2,16 +2,21 @@ import { TransactionMonad } from '@lblod/ember-rdfa-editor/utils/transaction-uti
 import { MobilityMeasureConcept } from '../schemas/mobility-measure-concept';
 import { Variable } from '../schemas/variable';
 import { ZonalOrNot } from '../constants';
-interface InsertMeasureArgs {
-    measureConcept: MobilityMeasureConcept;
+import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
+import { VariableInstance } from '../schemas/variable-instance';
+type InsertMeasureArgs = {
     zonality: ZonalOrNot;
     temporal: boolean;
     variables: Record<string, Exclude<Variable, {
         type: 'instruction';
-    }>>;
+    }> | VariableInstance>;
     templateString: string;
     decisionUri: string;
     articleUriGenerator?: () => string;
-}
-export default function insertMeasure({ measureConcept, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, }: InsertMeasureArgs): TransactionMonad<boolean>;
+} & ({
+    measureConcept: MobilityMeasureConcept;
+} | {
+    measureDesign: MobilityMeasureDesign;
+});
+export default function insertMeasure({ zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
 export {};

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

@@ -0,0 +1,279 @@
+import { z } from 'zod';
+import { type MobilityMeasureConcept } from './mobility-measure-concept';
+export declare const MobilityMeasureDesignSchema: z.ZodObject<{
+    uri: z.ZodString;
+    trafficSignals: z.ZodArray<z.ZodObject<{
+        uri: z.ZodString;
+        trafficSignalConcept: z.ZodIntersection<z.ZodObject<{
+            uri: z.ZodString;
+            code: z.ZodString;
+            regulatoryNotation: z.ZodOptional<z.ZodString>;
+            image: z.ZodString;
+            position: z.ZodDefault<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            code: string;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        }, {
+            code: string;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+            type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
+            categories: z.ZodDefault<z.ZodArray<z.ZodObject<{
+                uri: z.ZodString;
+                label: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                label: string;
+                uri: string;
+            }, {
+                label: string;
+                uri: string;
+            }>, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        }, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        }>, z.ZodObject<{
+            type: z.ZodEnum<["https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept", "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept"]>;
+        }, "strip", z.ZodTypeAny, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }>]>>;
+    }, "strip", z.ZodTypeAny, {
+        uri: string;
+        trafficSignalConcept: {
+            code: string;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        });
+    }, {
+        uri: string;
+        trafficSignalConcept: {
+            code: string;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        });
+    }>, "many">;
+    measureConcept: z.ZodObject<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        preview: z.ZodString;
+        zonality: z.ZodNativeEnum<{
+            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<{
+            uri: z.ZodString;
+            code: z.ZodString;
+            regulatoryNotation: z.ZodOptional<z.ZodString>;
+            image: z.ZodString;
+            position: z.ZodDefault<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            code: string;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        }, {
+            code: string;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+            type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
+            categories: z.ZodDefault<z.ZodArray<z.ZodObject<{
+                uri: z.ZodString;
+                label: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                label: string;
+                uri: string;
+            }, {
+                label: string;
+                uri: string;
+            }>, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        }, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        }>, z.ZodObject<{
+            type: z.ZodEnum<["https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept", "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept"]>;
+        }, "strip", z.ZodTypeAny, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }, {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }>]>>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        label: string;
+        uri: string;
+        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;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }))[];
+    }, {
+        label: string;
+        uri: string;
+        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;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }))[] | undefined;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    uri: string;
+    measureConcept: {
+        label: string;
+        uri: string;
+        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;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }))[];
+    };
+    trafficSignals: {
+        uri: string;
+        trafficSignalConcept: {
+            code: string;
+            image: string;
+            uri: string;
+            position: number;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories: {
+                label: string;
+                uri: string;
+            }[];
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        });
+    }[];
+}, {
+    uri: string;
+    measureConcept: {
+        label: string;
+        uri: string;
+        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;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        }))[] | undefined;
+    };
+    trafficSignals: {
+        uri: string;
+        trafficSignalConcept: {
+            code: string;
+            image: string;
+            uri: string;
+            position?: number | undefined;
+            regulatoryNotation?: string | undefined;
+        } & ({
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+            categories?: {
+                label: string;
+                uri: string;
+            }[] | undefined;
+        } | {
+            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        });
+    }[];
+}>;
+export type MobilityMeasureDesign = z.infer<typeof MobilityMeasureDesignSchema>;
+export declare function isMobilityMeasureDesign(conceptOrDesign: MobilityMeasureConcept | MobilityMeasureDesign): conceptOrDesign is MobilityMeasureDesign;

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

@@ -0,0 +1,90 @@
+import { z } from 'zod';
+import { TrafficSignalConcept } from './traffic-signal-concept';
+export declare const TrafficSignalSchema: z.ZodObject<{
+    uri: z.ZodString;
+    trafficSignalConcept: z.ZodIntersection<z.ZodObject<{
+        uri: z.ZodString;
+        code: z.ZodString;
+        regulatoryNotation: z.ZodOptional<z.ZodString>;
+        image: z.ZodString;
+        position: z.ZodDefault<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        code: string;
+        image: string;
+        uri: string;
+        position: number;
+        regulatoryNotation?: string | undefined;
+    }, {
+        code: string;
+        image: string;
+        uri: string;
+        position?: number | undefined;
+        regulatoryNotation?: string | undefined;
+    }>, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+        type: z.ZodLiteral<"https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept">;
+        categories: z.ZodDefault<z.ZodArray<z.ZodObject<{
+            uri: z.ZodString;
+            label: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            label: string;
+            uri: string;
+        }, {
+            label: string;
+            uri: string;
+        }>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories: {
+            label: string;
+            uri: string;
+        }[];
+    }, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories?: {
+            label: string;
+            uri: string;
+        }[] | undefined;
+    }>, z.ZodObject<{
+        type: z.ZodEnum<["https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept", "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept"]>;
+    }, "strip", z.ZodTypeAny, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }, {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    }>]>>;
+}, "strip", z.ZodTypeAny, {
+    uri: string;
+    trafficSignalConcept: {
+        code: string;
+        image: string;
+        uri: string;
+        position: number;
+        regulatoryNotation?: string | undefined;
+    } & ({
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories: {
+            label: string;
+            uri: string;
+        }[];
+    } | {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    });
+}, {
+    uri: string;
+    trafficSignalConcept: {
+        code: string;
+        image: string;
+        uri: string;
+        position?: number | undefined;
+        regulatoryNotation?: string | undefined;
+    } & ({
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+        categories?: {
+            label: string;
+            uri: string;
+        }[] | undefined;
+    } | {
+        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    });
+}>;
+export type TrafficSignal = z.infer<typeof TrafficSignalSchema>;
+export declare function isTrafficSignal(signalOrSignalConcept: TrafficSignal | TrafficSignalConcept): signalOrSignalConcept is TrafficSignal;

package/declarations/addon/plugins/roadsign-regulation-plugin/schemas/variable-instance.d.ts

@@ -0,0 +1,230 @@
+import { z } from 'zod';
+import { Variable } from './variable';
+export declare const VariableInstanceSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+}, {
+    value: z.ZodOptional<z.ZodString>;
+    variable: z.ZodObject<z.objectUtil.extendShape<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        source: z.ZodOptional<z.ZodString>;
+    }, {
+        type: z.ZodLiteral<"text">;
+        defaultValue: z.ZodOptional<z.ZodString>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "text";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }, {
+        type: "text";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }>;
+}>, "strip", z.ZodTypeAny, {
+    uri: string;
+    variable: {
+        type: "text";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}, {
+    uri: string;
+    variable: {
+        type: "text";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}>, z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+}, {
+    value: z.ZodOptional<z.ZodNumber>;
+    variable: z.ZodObject<z.objectUtil.extendShape<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        source: z.ZodOptional<z.ZodString>;
+    }, {
+        type: z.ZodLiteral<"number">;
+        defaultValue: z.ZodOptional<z.ZodNumber>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "number";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: number | undefined;
+    }, {
+        type: "number";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: number | undefined;
+    }>;
+}>, "strip", z.ZodTypeAny, {
+    uri: string;
+    variable: {
+        type: "number";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: number | undefined;
+    };
+    value?: number | undefined;
+}, {
+    uri: string;
+    variable: {
+        type: "number";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: number | undefined;
+    };
+    value?: number | undefined;
+}>, z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+}, {
+    value: z.ZodOptional<z.ZodDate>;
+    variable: z.ZodObject<z.objectUtil.extendShape<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        source: z.ZodOptional<z.ZodString>;
+    }, {
+        type: z.ZodLiteral<"date">;
+        defaultValue: z.ZodOptional<z.ZodDate>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "date";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: Date | undefined;
+    }, {
+        type: "date";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: Date | undefined;
+    }>;
+}>, "strip", z.ZodTypeAny, {
+    uri: string;
+    variable: {
+        type: "date";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: Date | undefined;
+    };
+    value?: Date | undefined;
+}, {
+    uri: string;
+    variable: {
+        type: "date";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: Date | undefined;
+    };
+    value?: Date | undefined;
+}>, z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+}, {
+    value: z.ZodOptional<z.ZodString>;
+    variable: z.ZodObject<z.objectUtil.extendShape<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        source: z.ZodOptional<z.ZodString>;
+    }, {
+        type: z.ZodLiteral<"location">;
+        defaultValue: z.ZodOptional<z.ZodString>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "location";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }, {
+        type: "location";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }>;
+}>, "strip", z.ZodTypeAny, {
+    uri: string;
+    variable: {
+        type: "location";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}, {
+    uri: string;
+    variable: {
+        type: "location";
+        label: string;
+        uri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}>, z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+}, {
+    value: z.ZodOptional<z.ZodString>;
+    variable: z.ZodObject<z.objectUtil.extendShape<{
+        uri: z.ZodString;
+        label: z.ZodString;
+        source: z.ZodOptional<z.ZodString>;
+    }, {
+        type: z.ZodLiteral<"codelist">;
+        defaultValue: z.ZodOptional<z.ZodString>;
+        codelistUri: z.ZodString;
+    }>, "strip", z.ZodTypeAny, {
+        type: "codelist";
+        label: string;
+        uri: string;
+        codelistUri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }, {
+        type: "codelist";
+        label: string;
+        uri: string;
+        codelistUri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    }>;
+}>, "strip", z.ZodTypeAny, {
+    uri: string;
+    variable: {
+        type: "codelist";
+        label: string;
+        uri: string;
+        codelistUri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}, {
+    uri: string;
+    variable: {
+        type: "codelist";
+        label: string;
+        uri: string;
+        codelistUri: string;
+        source?: string | undefined;
+        defaultValue?: string | undefined;
+    };
+    value?: string | undefined;
+}>]>;
+export type VariableInstance = z.infer<typeof VariableInstanceSchema>;
+export declare function isVariableInstance(variableOrVariableInstance: Variable | VariableInstance): variableOrVariableInstance is VariableInstance;

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

@@ -1,4 +1,124 @@
 import { z } from 'zod';
+export declare const TextVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"text">;
+    defaultValue: z.ZodOptional<z.ZodString>;
+}>, "strip", z.ZodTypeAny, {
+    type: "text";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}, {
+    type: "text";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}>;
+export declare const NumberVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"number">;
+    defaultValue: z.ZodOptional<z.ZodNumber>;
+}>, "strip", z.ZodTypeAny, {
+    type: "number";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: number | undefined;
+}, {
+    type: "number";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: number | undefined;
+}>;
+export declare const DateVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"date">;
+    defaultValue: z.ZodOptional<z.ZodDate>;
+}>, "strip", z.ZodTypeAny, {
+    type: "date";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: Date | undefined;
+}, {
+    type: "date";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: Date | undefined;
+}>;
+export declare const CodelistVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"codelist">;
+    defaultValue: z.ZodOptional<z.ZodString>;
+    codelistUri: z.ZodString;
+}>, "strip", z.ZodTypeAny, {
+    type: "codelist";
+    label: string;
+    uri: string;
+    codelistUri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}, {
+    type: "codelist";
+    label: string;
+    uri: string;
+    codelistUri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}>;
+export declare const LocationVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"location">;
+    defaultValue: z.ZodOptional<z.ZodString>;
+}>, "strip", z.ZodTypeAny, {
+    type: "location";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}, {
+    type: "location";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+    defaultValue?: string | undefined;
+}>;
+export declare const InstructionVariableSchema: z.ZodObject<z.objectUtil.extendShape<{
+    uri: z.ZodString;
+    label: z.ZodString;
+    source: z.ZodOptional<z.ZodString>;
+}, {
+    type: z.ZodLiteral<"instruction">;
+}>, "strip", z.ZodTypeAny, {
+    type: "instruction";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+}, {
+    type: "instruction";
+    label: string;
+    uri: string;
+    source?: string | undefined;
+}>;
 export declare const VariableSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<z.objectUtil.extendShape<{
     uri: z.ZodString;
     label: z.ZodString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "33.1.0",
+  "version": "33.2.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",