@lblod/ember-rdfa-editor-lblod-plugins 32.0.0 → 32.1.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 32.1.0
+
+### Minor Changes
+
+- [#573](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/573) [`be9e2f4`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/be9e2f476266037926f43f2729aae7e969c55652) Thanks [@elpoelma](https://github.com/elpoelma)! - Roadsign-regulation-plugin: differentiate between 'Verkeersbord' and 'Onderbord' signs
+
+### Patch Changes
+
+- [#576](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/576) [`c68bef3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/c68bef3a3e215e0d721894b72f8e0754b9988ca9) Thanks [@elpoelma](https://github.com/elpoelma)! - Slightly readjust styling of `snippet` and `structure` nodes, to ensure better cursor behaviour in firefox.
+  Note: for the better cursor behaviour in firefox to work as expected, `@lblod/ember-rdfa-editor` version [12.8.0](https://github.com/lblod/ember-rdfa-editor/releases/tag/%40lblod%2Fember-rdfa-editor%4012.8.0) or higher needs to be installed.
+
 ## 32.0.0
 
 ### Major Changes

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

@@ -19,6 +19,7 @@ import { eq } from 'ember-truth-helpers';
 import t from 'ember-intl/helpers/t';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
+import { SIGN_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 
 type Signature = {
   Args: {
@@ -44,8 +45,10 @@ export default class RoadSignsTable extends Component<Signature> {
   categories = (measureConcept: MobilityMeasureConcept) => {
     const categorySet: Set<string> = new Set();
     for (const signConcept of measureConcept.signConcepts) {
-      const categories = signConcept.classifications;
-      addAll(categorySet, ...categories);
+      if (signConcept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
+        const categoryLabels = signConcept.categories.map((cat) => cat.label);
+        addAll(categorySet, ...categoryLabels);
+      }
     }
     return [...categorySet].sort();
   };

package/addon/components/snippet-plugin/nodes/snippet.gts

@@ -226,7 +226,7 @@ export default class SnippetNode extends Component<Signature> {
           </span>
           {{this.node.attrs.title}}
         </div>
-        <div class='say-snippet-content'>
+        <div class='say-snippet-body'>
           {{yield}}
           <div class='say-snippet-icons' contenteditable='false'>
             <SnippetButton

package/addon/components/structure-plugin/_private/structure.gts

@@ -226,9 +226,7 @@ export default class Structure extends Component<Sig> {
           </Tag>
         {{/let}}
       </div>
-      <div class='say-structure__content'>
-        {{yield}}
-      </div>
+      {{yield}}
     </div>
   </template>
 }

package/addon/components/template-comments-plugin/template-comment.hbs

@@ -8,7 +8,5 @@
     {{if this.selectionInside "ProseMirror-selectednode"}}
     say-default-cursor'
 >
-  <div class='say-text-cursor'>
-    {{yield}}
-  </div>
+  {{yield}}
 </AuAlert>

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

@@ -25,7 +25,8 @@ import { buildArticleStructure } from '../../decision-plugin/utils/build-article
 import { insertArticle } from '../../decision-plugin/actions/insert-article';
 import { SignConcept } from '../schemas/sign-concept';
 import {
-  SIGN_CONCEPT_TYPE_LABELS,
+  ROAD_SIGN_CATEGORIES,
+  SIGN_CONCEPT_TYPES,
   SIGN_TYPE_MAPPING,
   SIGN_TYPES,
   ZONALITY_OPTIONS,
@@ -190,9 +191,28 @@ function constructMeasureBody(
   return schema.nodes.paragraph.create({}, nodes);
 }
 
+function determineSignLabel(signConcept: SignConcept) {
+  switch (signConcept.type) {
+    case SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT:
+      return 'Verkeerslicht';
+    case SIGN_CONCEPT_TYPES.ROAD_MARKING:
+      return 'Wegmarkering';
+    case SIGN_CONCEPT_TYPES.ROAD_SIGN:
+      if (
+        signConcept.categories
+          .map((cat) => cat.uri)
+          .includes(ROAD_SIGN_CATEGORIES.ONDERBORD)
+      ) {
+        return 'Onderbord';
+      } else {
+        return 'Verkeersbord';
+      }
+  }
+}
+
 function constructSignNode(signConcept: SignConcept, schema: Schema) {
   const signUri = `http://data.lblod.info/verkeerstekens/${uuid()}`;
-  const prefix = SIGN_CONCEPT_TYPE_LABELS[signConcept.type];
+  const prefix = determineSignLabel(signConcept);
   const node = schema.nodes.inline_rdfa.create(
     {
       rdfaNodeType: 'resource',

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

@@ -29,9 +29,25 @@ export const SIGN_TYPE_MAPPING = {
   [SIGN_CONCEPT_TYPES.ROAD_MARKING]: SIGN_TYPES.ROAD_MARKING,
 } as const;
 
-export const SIGN_CONCEPT_TYPE_LABELS = {
-  [SIGN_CONCEPT_TYPES.TRAFFIC_SIGN]: 'Verkeersteken',
-  [SIGN_CONCEPT_TYPES.ROAD_SIGN]: 'Verkeersbord',
-  [SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT]: 'Verkeerslicht',
-  [SIGN_CONCEPT_TYPES.ROAD_MARKING]: 'Wegmarkering',
-} as const;
+export const ROAD_SIGN_CATEGORIES = {
+  XXBORD:
+    'https://data.vlaanderen.be/id/concept/Verkeersbordcategorie/ae1b7231-1f31-492d-947a-25fc5d114492',
+  'XX-AWVBORD':
+    'https://data.vlaanderen.be/id/concept/Verkeersbordcategorie/8e302648-0eca-478b-8b48-67c3b0e39c0a',
+  GEVAARSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/2982567006d9e19f04063df73123f56f40e3a28941031a7ba6e6667f64740fa9',
+  STILSTAANPARKEERBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/29ea3335e357e414d07229242607b352941c0c21e78760600cc0f5270f18c38b',
+  VOORRANGSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/737da5751bc7f311398a834f34df310dd95255a0b62afa2db2882c72d54b47d2',
+  ZONEBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/86a67f3cba6512ae10c4b9b09ba35d8c80109189b44d37e848858af9efb37019',
+  VERBODSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/955a9adc73d076a2a424754cd540b73da8d15fb002ab6c9f115d080edddb57e8',
+  ONDERBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/991b04b477b77bc7cf1414fb5d255cc4435dd9c1681e8de66f770710c1c83ad0',
+  GEBODSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/9d84069e70f192b7a474d02f07687bc3343ee324207ad9e093c0b2f5def647f8',
+  AANWIJSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/9ea8f8b421343370d20a8bd45d6226aadc48125bda8ddbbeeb53d99f181ee05a',
+};

package/addon/plugins/roadsign-regulation-plugin/queries/road-sign-category.ts

@@ -2,6 +2,7 @@ import {
   BindingObject,
   executeQuery,
   objectify,
+  sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 import {
   RoadSignCategory,
@@ -10,16 +11,18 @@ import {
 
 type QueryOptions = {
   abortSignal?: AbortSignal;
+  roadSignConceptUri?: string;
 };
 
 export default async function queryRoadSignCategories(
   endpoint: string,
   options: QueryOptions = {},
 ) {
-  const { abortSignal } = options;
+  const { abortSignal, roadSignConceptUri } = options;
   const query = /* sparql */ `
     PREFIX mobiliteit: <https://data.vlaanderen.be/ns/mobiliteit#>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+    PREFIX dct: <http://purl.org/dc/terms/>
 
     SELECT DISTINCT
       ?uri
@@ -27,6 +30,8 @@ export default async function queryRoadSignCategories(
     WHERE {
       ?uri a mobiliteit:Verkeersbordcategorie;
            skos:prefLabel ?label.
+
+      ${roadSignConceptUri ? `${sparqlEscapeUri(roadSignConceptUri)} dct:type ?uri` : ''}
     }
   `;
   const queryResult = await executeQuery<BindingObject<RoadSignCategory>>({

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

@@ -6,6 +6,8 @@ import {
   sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 import { SignConcept, SignConceptSchema } from '../schemas/sign-concept';
+import queryRoadSignCategories from './road-sign-category';
+import { SIGN_CONCEPT_TYPES } from '../constants';
 
 type QueryOptions = {
   imageBaseUrl?: string;
@@ -31,7 +33,6 @@ export async function querySignConcepts(
       ?code
       ?zonality
       (CONCAT(${sparqlEscapeString(imageBaseUrl ?? '')}, "/files/", ?imageId, "/download") AS ?image)
-      (GROUP_CONCAT(?classification; SEPARATOR="|") AS ?classifications)
     WHERE {
       ?uri
         a mobiliteit:Verkeerstekenconcept;
@@ -44,9 +45,6 @@ export async function querySignConcepts(
       OPTIONAL {
         ?uri ext:zonality ?zonality.
       }
-      OPTIONAL {
-        ?uri dct:type/skos:prefLabel ?classification.
-      }
 
       VALUES ?type {
         <https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept>
@@ -63,13 +61,21 @@ export async function querySignConcepts(
     abortSignal,
   });
   const bindings = queryResult.results.bindings;
-  const processed = bindings.map(objectify).map((binding) => {
-    return {
-      ...binding,
-      classifications: binding.classifications
-        ? binding.classifications.split('|')
-        : [],
-    };
-  });
-  return SignConceptSchema.array().parse(processed);
+  const concepts = SignConceptSchema.array().parse(bindings.map(objectify));
+  const conceptsWithCategories = await Promise.all(
+    concepts.map(async (concept) => {
+      if (concept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
+        const categories = await queryRoadSignCategories(endpoint, {
+          roadSignConceptUri: concept.uri,
+        });
+        return {
+          ...concept,
+          categories,
+        };
+      } else {
+        return concept;
+      }
+    }),
+  );
+  return conceptsWithCategories;
 }

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

@@ -1,13 +1,27 @@
 import { z } from 'zod';
 import { SIGN_CONCEPT_TYPES, ZONALITY_OPTIONS } from '../constants';
+import { RoadSignCategorySchema } from './road-sign-category';
 
-export const SignConceptSchema = z.object({
-  uri: z.string(),
-  code: z.string(),
-  type: z.nativeEnum(SIGN_CONCEPT_TYPES),
-  image: z.string(),
-  classifications: z.array(z.string()).default([]),
-  zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
-});
+export const SignConceptSchema = z
+  .object({
+    uri: z.string(),
+    code: z.string(),
+    image: z.string(),
+    zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
+  })
+  .and(
+    z.discriminatedUnion('type', [
+      z.object({
+        type: z.literal(SIGN_CONCEPT_TYPES.ROAD_SIGN),
+        categories: z.array(RoadSignCategorySchema).default([]),
+      }),
+      z.object({
+        type: z.enum([
+          SIGN_CONCEPT_TYPES.ROAD_MARKING,
+          SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT,
+        ]),
+      }),
+    ]),
+  );
 
 export type SignConcept = z.infer<typeof SignConceptSchema>;

package/addon/plugins/snippet-plugin/nodes/snippet.ts

@@ -175,6 +175,7 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
     allowMultipleSnippets: { default: false },
   },
   component: SnippetComponent,
+  contentDomClassNames: ['say-snippet-content'],
   content: options.allowedContent || DEFAULT_CONTENT_STRING,
   serialize(node) {
     const listNames = node.attrs.snippetListNames as string[];

package/addon/plugins/structure-plugin/node.ts

@@ -118,6 +118,7 @@ export const emberNodeConfig: (
   return {
     name: 'structure',
     component: Structure as unknown as ComponentLike,
+    contentDomClassNames: ['say-structure__content'],
     inline: false,
     group: 'block structure',
     content: 'block+',

package/addon/plugins/template-comments-plugin/node.ts

@@ -22,6 +22,7 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
   return {
     name: 'template-comment',
     component: TemplateCommentsComponent as unknown as ComponentLike,
+    contentDomClassNames: ['say-template-comment-content'],
     inline: false,
     group: 'block',
     content: 'block+',

package/addon/plugins/variable-plugin/variables/date.ts

@@ -282,6 +282,7 @@ const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
   draggable: false,
   atom: true,
   recreateUriFunction: recreateVariableUris,
+  needsFFKludge: true,
   defining: false,
   options,
   attrs: {

package/app/styles/snippet-plugin.scss

@@ -102,13 +102,19 @@
       color: black;
     }
   }
-  .say-snippet-content {
+
+  .say-snippet-body {
     position: relative;
+    margin-top: 0;
+  }
+
+  .say-snippet-content {
     padding: 20px;
     min-height: 100px;
     padding-right: 50px;
     margin-top: 0;
   }
+
   .say-snippet-icons {
     display: flex;
     width: fit-content;

package/app/styles/structure-plugin.scss

@@ -71,10 +71,11 @@
   }
 }
 
-.say-structure > .say-structure__content {
+.say-structure > [data-slot] {
   margin-top: 0;
 }
 .say-structure__content {
+  margin-top: 0;
   padding: 0.7rem;
   padding-right: 3rem;
 

package/app/styles/template-comments-plugin.scss

@@ -36,6 +36,6 @@
   cursor: default;
 }
 
-.say-text-cursor {
+.say-template-comment-content {
   cursor: text;
 }

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

@@ -84,14 +84,20 @@ export default class RoadsignsModal extends Component<Signature> {
             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;
             variableSignage: boolean;
-            signConcepts: {
-                type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+            signConcepts: ({
                 code: string;
                 image: string;
                 uri: string;
-                classifications: 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" | 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";
+            }))[];
         }[];
         count: number;
     }>>;
@@ -105,14 +111,20 @@ export default class RoadsignsModal extends Component<Signature> {
         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;
         variableSignage: boolean;
-        signConcepts: {
-            type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+        signConcepts: ({
             code: string;
             image: string;
             uri: string;
-            classifications: 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" | 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";
+        }))[];
     }[] | undefined;
     get measureConceptCount(): number | undefined;
     insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: typeof ZONALITY_OPTIONS.ZONAL | typeof ZONALITY_OPTIONS.NON_ZONAL, temporal: boolean) => Promise<void>>;

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

@@ -21,9 +21,15 @@ export declare const SIGN_TYPE_MAPPING: {
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslicht";
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept": "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkering";
 };
-export declare const SIGN_CONCEPT_TYPE_LABELS: {
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept": "Verkeersteken";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept": "Verkeersbord";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept": "Verkeerslicht";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept": "Wegmarkering";
+export declare const ROAD_SIGN_CATEGORIES: {
+    XXBORD: string;
+    'XX-AWVBORD': string;
+    GEVAARSBORD: string;
+    STILSTAANPARKEERBORD: string;
+    VOORRANGSBORD: string;
+    ZONEBORD: string;
+    VERBODSBORD: string;
+    ONDERBORD: string;
+    GEBODSBORD: string;
+    AANWIJSBORD: string;
 };

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

@@ -16,14 +16,20 @@ export declare function queryMobilityMeasures(endpoint: string, options?: Omit<Q
     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;
     variableSignage: boolean;
-    signConcepts: {
-        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    signConcepts: ({
         code: string;
         image: string;
         uri: string;
-        classifications: 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" | 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";
+    }))[];
 }[]>;
 export declare function countMobilityMeasures(endpoint: string, options?: Omit<QueryOptions, 'count' | 'page' | 'pageSize'>): Promise<number>;
 export {};

package/declarations/addon/plugins/roadsign-regulation-plugin/queries/road-sign-category.d.ts

@@ -1,5 +1,6 @@
 type QueryOptions = {
     abortSignal?: AbortSignal;
+    roadSignConceptUri?: string;
 };
 export default function queryRoadSignCategories(endpoint: string, options?: QueryOptions): Promise<{
     label: string;

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

@@ -3,12 +3,22 @@ type QueryOptions = {
     measureConceptUri?: string;
     abortSignal?: AbortSignal;
 };
-export declare function querySignConcepts(endpoint: string, options?: QueryOptions): Promise<{
-    type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+export declare function querySignConcepts(endpoint: string, options?: QueryOptions): Promise<(({
     code: string;
     image: string;
     uri: string;
-    classifications: 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" | undefined;
-}[]>;
+} & {
+    type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+}) | {
+    categories: {
+        label: string;
+        uri: string;
+    }[];
+    code: string;
+    image: 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" | undefined;
+    type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
+})[]>;
 export {};

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

@@ -9,64 +9,95 @@ export declare const MobilityMeasureConceptSchema: z.ZodObject<{
         readonly NON_ZONAL: "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc";
     }>;
     variableSignage: z.ZodDefault<z.ZodBoolean>;
-    signConcepts: z.ZodDefault<z.ZodArray<z.ZodObject<{
+    signConcepts: z.ZodDefault<z.ZodArray<z.ZodIntersection<z.ZodObject<{
         uri: z.ZodString;
         code: z.ZodString;
-        type: z.ZodNativeEnum<{
-            readonly TRAFFIC_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept";
-            readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
-            readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept";
-            readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
-        }>;
         image: z.ZodString;
-        classifications: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
         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";
         }>>;
     }, "strip", z.ZodTypeAny, {
-        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
         code: string;
         image: string;
         uri: string;
-        classifications: 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" | undefined;
     }, {
-        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
         code: string;
         image: string;
         uri: string;
-        classifications?: 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;
-    }>, "many">>;
+    }>, 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;
     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;
     variableSignage: boolean;
-    signConcepts: {
-        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    signConcepts: ({
         code: string;
         image: string;
         uri: string;
-        classifications: 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" | 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;
     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;
     variableSignage?: boolean | undefined;
-    signConcepts?: {
-        type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
+    signConcepts?: ({
         code: string;
         image: string;
         uri: string;
-        classifications?: 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;
-    }[] | 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;
 }>;
 export type MobilityMeasureConcept = z.infer<typeof MobilityMeasureConceptSchema>;

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

@@ -1,33 +1,52 @@
 import { z } from 'zod';
-export declare const SignConceptSchema: z.ZodObject<{
+export declare const SignConceptSchema: z.ZodIntersection<z.ZodObject<{
     uri: z.ZodString;
     code: z.ZodString;
-    type: z.ZodNativeEnum<{
-        readonly TRAFFIC_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept";
-        readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
-        readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept";
-        readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
-    }>;
     image: z.ZodString;
-    classifications: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
     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";
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
     code: string;
     image: string;
     uri: string;
-    classifications: 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" | undefined;
 }, {
-    type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept" | "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept";
     code: string;
     image: string;
     uri: string;
-    classifications?: 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<{
+        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";
+}>]>>;
 export type SignConcept = z.infer<typeof SignConceptSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "32.0.0",
+  "version": "32.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -109,7 +109,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.6.0",
+    "@lblod/ember-rdfa-editor": "12.8.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",

package/pnpm-lock.yaml

@@ -181,8 +181,8 @@ importers:
         specifier: 4.3.3
         version: 4.3.3
       '@lblod/ember-rdfa-editor':
-        specifier: 12.6.0
-        version: 12.6.0(uyopq47zhjkpyroiqgd3grmn6i)
+        specifier: 12.8.0
+        version: 12.8.0(uyopq47zhjkpyroiqgd3grmn6i)
       '@rdfjs/types':
         specifier: ^1.1.0
         version: 1.1.0
@@ -1708,8 +1708,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@lblod/ember-rdfa-editor@12.6.0':
-    resolution: {integrity: sha512-LrdXe7lk++zYin5IzP+Bele0d2gkA6ZpgoG9HlPb2fcuiei1pxnWOcWwbN2WxAGgd3igNlUPTihDFTE6w68/NQ==}
+  '@lblod/ember-rdfa-editor@12.8.0':
+    resolution: {integrity: sha512-ertVM7p2QOSg0SbwoVCv1o6c/ZlfuSP750URzco8hzrTLd+zuZWWK+94nEpXQRuHgc8mDUU0MQcRYTrewt2h6g==}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.5.0
       '@ember/test-helpers': ^2.9.4 || ^3.2.1 || ^4.0.2 || ^5.0.0
@@ -11928,7 +11928,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@12.6.0(uyopq47zhjkpyroiqgd3grmn6i)':
+  '@lblod/ember-rdfa-editor@12.8.0(uyopq47zhjkpyroiqgd3grmn6i)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.5.0(@ember/test-helpers@3.3.1(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))(webpack@5.97.1))(@glint/environment-ember-loose@1.5.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(@types/ember__array@4.0.10(@babel/core@7.26.0))(@types/ember__component@4.0.22(@babel/core@7.26.0))(@types/ember__controller@4.0.12(@babel/core@7.26.0))(@types/ember__object@4.0.12(@babel/core@7.26.0))(@types/ember__routing@4.0.22(@babel/core@7.26.0))(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))))(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))(tracked-built-ins@3.3.0)(webpack@5.97.1)
       '@codemirror/commands': 6.6.0
@@ -12480,27 +12480,6 @@ snapshots:
     dependencies:
       '@types/ms': 0.7.34
 
-  '@types/ember@4.0.11':
-    dependencies:
-      '@types/ember__application': 4.0.11(@babel/core@7.26.0)
-      '@types/ember__array': 4.0.10(@babel/core@7.26.0)
-      '@types/ember__component': 4.0.22(@babel/core@7.26.0)
-      '@types/ember__controller': 4.0.12(@babel/core@7.26.0)
-      '@types/ember__debug': 4.0.8(@babel/core@7.26.0)
-      '@types/ember__engine': 4.0.11(@babel/core@7.26.0)
-      '@types/ember__error': 4.0.6
-      '@types/ember__object': 4.0.12(@babel/core@7.26.0)
-      '@types/ember__polyfills': 4.0.6
-      '@types/ember__routing': 4.0.22(@babel/core@7.26.0)
-      '@types/ember__runloop': 4.0.10
-      '@types/ember__service': 4.0.9(@babel/core@7.26.0)
-      '@types/ember__string': 3.16.3
-      '@types/ember__template': 4.0.7
-      '@types/ember__test': 4.0.6(@babel/core@7.26.0)
-      '@types/ember__utils': 4.0.7
-      '@types/rsvp': 4.0.9
-    optional: true
-
   '@types/ember@4.0.11(@babel/core@7.26.0)':
     dependencies:
       '@types/ember__application': 4.0.11(@babel/core@7.26.0)
@@ -12528,7 +12507,7 @@ snapshots:
   '@types/ember__application@4.0.11(@babel/core@7.26.0)':
     dependencies:
       '@glimmer/component': 1.1.2(@babel/core@7.26.0)
-      '@types/ember': 4.0.11
+      '@types/ember': 4.0.11(@babel/core@7.26.0)
       '@types/ember__engine': 4.0.11(@babel/core@7.26.0)
       '@types/ember__object': 4.0.12(@babel/core@7.26.0)
       '@types/ember__owner': 4.0.9
@@ -12630,11 +12609,6 @@ snapshots:
       - supports-color
     optional: true
 
-  '@types/ember__runloop@4.0.10':
-    dependencies:
-      '@types/ember': 4.0.11
-    optional: true
-
   '@types/ember__runloop@4.0.10(@babel/core@7.26.0)':
     dependencies:
       '@types/ember': 4.0.11(@babel/core@7.26.0)
@@ -12667,11 +12641,6 @@ snapshots:
       - supports-color
     optional: true
 
-  '@types/ember__utils@4.0.7':
-    dependencies:
-      '@types/ember': 4.0.11
-    optional: true
-
   '@types/ember__utils@4.0.7(@babel/core@7.26.0)':
     dependencies:
       '@types/ember': 4.0.11(@babel/core@7.26.0)