@lblod/ember-rdfa-editor-lblod-plugins 33.3.0 → 33.4.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 33.4.0
+
+### Minor Changes
+
+- [#614](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/614) [`a3d02d2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/a3d02d2d456f4c9925cbd609ed14cfcb0b800195) Thanks [@piemonkey](https://github.com/piemonkey)! - When inserting traffic measures, filter 'zonebord' signs from the list
+
+- [#613](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/613) [`770636c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/770636ca8ec292930c2ff01dfcb8b20c5737251d) Thanks [@piemonkey](https://github.com/piemonkey)! - When inserting an AR design, include the link to the design in the RDFa
+
 ## 33.3.0
 
 ### Minor Changes

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

@@ -7,10 +7,12 @@ import {
 } from '@lblod/ember-rdfa-editor';
 import { v4 as uuid } from 'uuid';
 import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
+import { type FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
   DCT,
   EXT,
   MOBILITEIT,
+  ONDERDEEL,
   PROV,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -46,6 +48,7 @@ import {
 } from '../schemas/variable-instance';
 
 type InsertMeasureArgs = {
+  arDesignUri?: string;
   zonality: ZonalOrNot;
   temporal: boolean;
   variables: Record<
@@ -65,6 +68,7 @@ type InsertMeasureArgs = {
 );
 
 export default function insertMeasure({
+  arDesignUri,
   zonality,
   temporal,
   variables,
@@ -79,10 +83,26 @@ export default function insertMeasure({
         ? args.measureConcept
         : args.measureDesign.measureConcept;
     const measureDesign = 'measureDesign' in args && args.measureDesign;
+    const externalTriples: FullTriple[] | undefined =
+      !arDesignUri || !measureDesign
+        ? undefined
+        : [
+            {
+              subject: sayDataFactory.namedNode(arDesignUri),
+              predicate: ONDERDEEL('BevatMaatregelOntwerp').full,
+              object: sayDataFactory.namedNode(measureDesign.uri),
+            },
+          ];
     const { schema } = state;
-    const signNodes = measureConcept.trafficSignalConcepts.map((signConcept) =>
-      constructSignalNode(signConcept, schema, zonality),
-    );
+    const signNodes = measureConcept.trafficSignalConcepts
+      .filter(
+        (signConcept) =>
+          signConcept.type !== TRAFFIC_SIGNAL_CONCEPT_TYPES.ROAD_SIGN ||
+          !signConcept.categories.some(
+            (cat) => cat.uri === ROAD_SIGN_CATEGORIES.ZONEBORD,
+          ),
+      )
+      .map((signConcept) => constructSignalNode(signConcept, schema, zonality));
     let signSection: PNode[] = [];
     if (signNodes.length) {
       const signList = schema.nodes.bullet_list.create(
@@ -150,6 +170,7 @@ export default function insertMeasure({
           // mobiliteit:periode, mobiliteit:plaatsbepaling, schema:eventSchedule, mobiliteit:type,
           // mobiliteit:verwijstNaar, mobiliteit:heeftGevolg
         ],
+        externalTriples,
       },
       [measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
     );

package/addon/utils/constants.ts

@@ -67,3 +67,7 @@ export const BESTUURSPERIODES = {
 export type BestuursperiodeLabel = keyof typeof BESTUURSPERIODES;
 export type BestuursperiodeURI =
   (typeof BESTUURSPERIODES)[BestuursperiodeLabel];
+export const ONDERDEEL = namespace(
+  'https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#',
+  'onderdeel',
+);

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

@@ -5,6 +5,7 @@ import { ZonalOrNot } from '../constants';
 import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
 import { VariableInstance } from '../schemas/variable-instance';
 type InsertMeasureArgs = {
+    arDesignUri?: string;
     zonality: ZonalOrNot;
     temporal: boolean;
     variables: Record<string, Exclude<Variable, {
@@ -18,5 +19,5 @@ type InsertMeasureArgs = {
 } | {
     measureDesign: MobilityMeasureDesign;
 });
-export default function insertMeasure({ zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
+export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
 export {};

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

@@ -28,3 +28,4 @@ export declare const BESTUURSPERIODES: {
 };
 export type BestuursperiodeLabel = keyof typeof BESTUURSPERIODES;
 export type BestuursperiodeURI = (typeof BESTUURSPERIODES)[BestuursperiodeLabel];
+export declare const ONDERDEEL: <Suffix extends string = string>(s: Suffix) => import("@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace").Resource<`https://wegenenverkeer.data.vlaanderen.be/ns/onderdeel#${Suffix}`, `onderdeel:${Suffix}`>;

package/package.json

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