@lblod/ember-rdfa-editor-lblod-plugins 26.0.2 → 26.1.0-dev.42b04a7414e40adf20dff16d76bdf1edff8ea5ff

package/.changeset/few-buses-pay.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add configuration option to location plugin to automatically link to resources in the wider document

package/.changeset/five-suits-pull.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Use prov:atLocation predicate for locations instead of dct:spatial

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 26.1.0
+
+### Minor Changes
+
+- [#514](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/514) [`21dcb88`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/21dcb88270ef5c4b43492db987811603aa996af5) Thanks [@piemonkey](https://github.com/piemonkey)! - Change predicate used for decision theme to match application profile
+
+- [#515](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/515) [`e1f4791`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e1f47919b3f6af6300bbf4b6ea2e418240220666) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Allow the user to select how they want the article titles
+
+- [#510](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/510) [`ffe23cb`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/ffe23cb7501a94ee7a10839eac363ddae0b5d2b6) Thanks [@abeforgit](https://github.com/abeforgit)! - Make the decision-topic plugin useable outside decisions
+
+### Patch Changes
+
+- [#487](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/487) [`1c95c0f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/1c95c0fbf3e9433ab5e1b0610e9c592f5fddb80b) Thanks [@andreo141](https://github.com/andreo141)! - Change the IRGN plugin to prefix the sign code with the traffic sign type in the outputted HTML of a measure.
+
+- [#513](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/513) [`90615a4`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/90615a4c6d0daa6509a7d08cc6126c74a4a6ee26) Thanks [@elpoelma](https://github.com/elpoelma)! - bugfix: ensure that an http://data.europa.eu/eli/ontology#has_part relationship is created between the article and decision when inserting an article container/block
+
+- [#516](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/516) [`a51ff27`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/a51ff279e4a2b808081fb2eb192f4071eccbc14a) Thanks [@elpoelma](https://github.com/elpoelma)! - Execute `recalculateNumbers` transaction-monad when inserting article container
+
 ## 26.0.2
 
 ### Patch Changes

package/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.ts

@@ -2,8 +2,8 @@ import { tracked } from '@glimmer/tracking';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import { transformExternalTriples } from '@lblod/ember-rdfa-editor/utils/external-triple-utils';
 import { trackedFunction } from 'reactiveweb/function';
-import { ELI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { AlertTriangleIcon } from '@appuniversum/ember-appuniversum/components/icons/alert-triangle';
 import { CrossIcon } from '@appuniversum/ember-appuniversum/components/icons/cross';
 import { MailIcon } from '@appuniversum/ember-appuniversum/components/icons/mail';
@@ -18,9 +18,15 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
 import {
   updateBesluitTopicResource,
-  ELI_SUBJECT,
+  TOPIC_PREDICATE,
+  TOPIC_PREDICATE_DEPRECATED,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/commands/update-besluit-topic-resource';
 import { getOutgoingTripleList } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import {
+  FullTriple,
+  OutgoingTriple,
+} from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 
 type Args = {
   controller: SayController;
@@ -52,9 +58,43 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
   }
 
   get showCard() {
-    return !!this.decisionRange;
+    return this.decisionUri || this.decisionRange;
+  }
+  get options() {
+    return this.args.options;
+  }
+  get decisionUri() {
+    return this.options.decisionUri;
   }
 
+  get currentTopicUris() {
+    if (this.decisionRange) {
+      const triples: OutgoingTriple[] = this.findTopicTriples(
+        this.decisionRange.node.attrs,
+      );
+      const topicTriples = triples.filter(
+        (topic) =>
+          topic.object.termType === 'NamedNode' &&
+          topic.object.value.includes(
+            'https://data.vlaanderen.be/id/concept/BesluitThema/',
+          ),
+      );
+      return topicTriples.map((topic) => topic.object.value);
+    } else if (this.decisionUri) {
+      const triples: FullTriple[] = this.doc.attrs['externalTriples'];
+      const topicTriples = triples.filter(
+        (topic) =>
+          topic.subject.value === this.decisionUri &&
+          topic.object.termType === 'NamedNode' &&
+          topic.object.value.includes(
+            'https://data.vlaanderen.be/id/concept/BesluitThema/',
+          ),
+      );
+      return topicTriples.map((topic) => topic.object.value);
+    } else {
+      return [];
+    }
+  }
   topics = trackedFunction(this, async () => {
     const result = await fetchBesluitTopics({
       config: { endpoint: this.args.options.endpoint },
@@ -71,10 +111,27 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
 
     return topics.filter((besluitTopic) => uris.includes(besluitTopic.uri));
   }
+  findTopicTriples(attrs?: Record<string, unknown>): OutgoingTriple[] {
+    if (!attrs) {
+      return [];
+    }
+    const result = getOutgoingTripleList(attrs, TOPIC_PREDICATE);
+    if (result) {
+      return result;
+    }
+    return getOutgoingTripleList(attrs, TOPIC_PREDICATE_DEPRECATED);
+  }
+  matchTopicPredicate = (predicate: string): boolean => {
+    const newMatch = TOPIC_PREDICATE.matches(predicate);
+    if (newMatch) {
+      return newMatch;
+    }
+    return TOPIC_PREDICATE_DEPRECATED.matches(predicate);
+  };
 
   @action
   updateBesluitTopic() {
-    if (!this.topics.isFinished || !this.decisionRange) {
+    if (!this.topics.isFinished || !this.showCard) {
       return;
     }
     if (!this.topics.value) {
@@ -82,27 +139,10 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
       return;
     }
 
-    const outgoingBesluitTopics = getOutgoingTripleList(
-      this.decisionRange.node.attrs,
-      ELI(ELI_SUBJECT),
-    );
+    const besluitTopics = this.findBesluitTopicsByUris(this.currentTopicUris);
 
-    const besluitTopicsRelevant = outgoingBesluitTopics.filter(
-      (topic) =>
-        topic.object.termType === 'NamedNode' &&
-        topic.object.value.includes(
-          'https://data.vlaanderen.be/id/concept/BesluitThema/',
-        ),
-    );
-
-    const outgoingUris = besluitTopicsRelevant.map(
-      (topic) => topic.object.value,
-    );
-
-    const besluitTopics = this.findBesluitTopicsByUris(outgoingUris);
-
-    if (besluitTopicsRelevant && besluitTopics) {
-      this.previousBesluitTopics = outgoingUris;
+    if (this.currentTopicUris && besluitTopics) {
+      this.previousBesluitTopics = this.currentTopicUris;
 
       this.besluitTopicsSelected = besluitTopics;
     } else {
@@ -114,19 +154,40 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
   upsertBesluitTopic(selected: BesluitTopic[]) {
     this.besluitTopicsSelected = selected;
 
-    const resource = getCurrentBesluitURI(this.controller);
-
-    if (this.besluitTopicsSelected && resource) {
-      this.controller.doCommand(
-        updateBesluitTopicResource({
-          resource,
-          previousTopics: this.previousBesluitTopics,
-          newTopics: this.besluitTopicsSelected,
-        }),
-        {
-          view: this.args.controller.mainEditorView,
-        },
-      );
+    if (this.besluitTopicsSelected) {
+      const resource = getCurrentBesluitURI(this.controller);
+      if (resource) {
+        this.controller.doCommand(
+          updateBesluitTopicResource({
+            resource,
+            previousTopics: this.previousBesluitTopics,
+            newTopics: this.besluitTopicsSelected,
+          }),
+          {
+            view: this.args.controller.mainEditorView,
+          },
+        );
+      } else if (this.decisionUri) {
+        const factory = new SayDataFactory();
+        // locking it in for the closure
+        const decisionUri = this.decisionUri;
+        const newTriples = this.besluitTopicsSelected.map((topic) => ({
+          subject: factory.namedNode(decisionUri),
+          predicate: TOPIC_PREDICATE.full,
+          object: factory.namedNode(topic.uri),
+        }));
+        const res = transformExternalTriples((oldTriples) => {
+          const notOurTriples = oldTriples.filter(
+            (trip) =>
+              trip.subject.value !== decisionUri ||
+              !this.matchTopicPredicate(trip.predicate),
+          );
+          return notOurTriples.concat(newTriples);
+        })(this.controller.mainEditorState);
+        if (res.result) {
+          this.controller.mainEditorView.dispatch(res.transaction);
+        }
+      }
     }
   }
 

package/addon/components/location-plugin/insert.gts

@@ -24,7 +24,7 @@ import {
   Point,
   Polygon,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
-import { replaceSelectionWithAddress } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/node-utils';
+import { replaceSelectionWithLocation } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/node-utils';
 import { type LocationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import { NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import Edit from './edit';
@@ -190,12 +190,13 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   @action
   insertOrEditAddress() {
     if (!this.selectedLocationNode) {
-      replaceSelectionWithAddress(
+      replaceSelectionWithLocation(
         this.controller,
         this.intl.t('location-plugin.default-label', {
           locale: this.documentLanguage,
         }),
         this.args.templateMode,
+        this.args.config.subjectTypesToLinkTo,
       );
     }
     this.modalOpen = true;

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

@@ -21,6 +21,7 @@ import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-
 import insertArticle from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands/insert-article-command';
 import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
 import { buildArticleStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/utils/build-article-structure';
+import Sign from '@lblod/ember-rdfa-editor-lblod-plugins/models/sign';
 
 const PAGE_SIZE = 10;
 const SIGN_TYPE_URI =
@@ -274,15 +275,17 @@ export default class RoadsignsModal extends Component<Args> {
       instructions,
       true,
     );
+
     const signsHTML = measure.signs
       .map((sign) => {
         const roadSignUri = 'http://data.lblod.info/verkeerstekens/' + uuid();
+        const trafficSignPrefix = this.addTrafficSignPrefix(sign);
         return `<li style="margin-bottom:1rem;">
         <span property="mobiliteit:wordtAangeduidDoor" resource=${roadSignUri} typeof="mobiliteit:Verkeersbord-Verkeersteken">
         <span property="mobiliteit:heeftVerkeersbordconcept" resource="${
           sign.uri
         }" typeof="mobiliteit:Verkeersbordconcept" style="display:flex;align-items:center;">
-          <span property="skos:prefLabel" style="padding-bottom:0;margin-left:0;margin-right:.4rem;">${
+          <span property="skos:prefLabel" style="padding-bottom:0;margin-left:0;margin-right:.4rem;"> ${trafficSignPrefix} ${
             sign.code
           }</span>
           <span style="margin-left:0;margin-top:0;">${
@@ -340,6 +343,23 @@ export default class RoadsignsModal extends Component<Args> {
     this.args.closeModal();
   }
 
+  @action
+  addTrafficSignPrefix(sign: Sign) {
+    let trafficSignPrefix;
+    switch (sign.type) {
+      case 'https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept':
+        trafficSignPrefix = 'Verkeersbord';
+        break;
+      case 'https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept':
+        trafficSignPrefix = 'Wegmarkering van artikel';
+        break;
+      case 'https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept':
+        trafficSignPrefix = 'Verkeerslicht van artikel';
+        break;
+    }
+    return trafficSignPrefix;
+  }
+
   @action
   goToPage(pageStart: number) {
     this.pageStart = pageStart;

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

@@ -95,12 +95,17 @@ export default class Structure extends Component<Sig> {
     return this.node.attrs.structureType as StructureType;
   }
 
+  get fullLengthArticles() {
+    return this.node.attrs.fullLengthArticles as boolean;
+  }
+
   get structureName() {
     const docLang = this.controller.mainEditorState.doc.attrs.lang;
     if (this.displayStructureName) {
       return getNameForStructureType(
         this.structureType,
         this.number,
+        this.fullLengthArticles,
         this.intl,
         docLang,
       );
@@ -113,7 +118,10 @@ export default class Structure extends Component<Sig> {
   }
 
   get title() {
-    if (this.node.attrs.isOnlyArticle) {
+    if (
+      this.node.attrs.isOnlyArticle &&
+      this.node.attrs.onlyArticleSpecialName
+    ) {
       const docLang = this.controller.mainEditorState.doc.attrs.lang;
       return this.intl.t('structure-plugin.only-article-title', {
         locale: docLang,

package/addon/models/sign.ts

@@ -4,6 +4,7 @@ import { unwrap } from '../utils/option';
 export default class Sign {
   constructor(
     readonly code: string,
+    readonly type: string,
     readonly image: string,
     readonly classifications: string[] = [],
     readonly uri: string,
@@ -19,10 +20,10 @@ export default class Sign {
 
     const uri = unwrap(binding['uri']?.value);
     const order = unwrap(binding['order']?.value);
-
+    const type = unwrap(binding['type']?.value);
     const classifications = binding['classifications']?.value.split('|') ?? [];
     const zonality = binding['zonality']?.value;
-    return new Sign(code, image, classifications, uri, order, zonality);
+    return new Sign(code, type, image, classifications, uri, order, zonality);
   }
 
   static processImage(url: string, imageBaseUrl: string) {

package/addon/plugins/besluit-topic-plugin/commands/update-besluit-topic-resource.ts

@@ -2,9 +2,13 @@ import { BesluitTopic } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/bes
 import { Command } from '@lblod/ember-rdfa-editor';
 import { addProperty, removeProperty } from '@lblod/ember-rdfa-editor/commands';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
-import { ELI } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import {
+  DCT,
+  ELI,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
-export const ELI_SUBJECT = 'is_about';
+export const TOPIC_PREDICATE = DCT('subject');
+export const TOPIC_PREDICATE_DEPRECATED = ELI('is_about');
 
 export const updateBesluitTopicResource = ({
   resource,
@@ -24,16 +28,18 @@ export const updateBesluitTopicResource = ({
         previousTopics.forEach((uri) => {
           newState = state.apply(transaction);
 
-          removeProperty({
-            resource,
-            property: {
-              predicate: ELI(ELI_SUBJECT).full,
-              object: sayDataFactory.namedNode(uri),
-            },
-            transaction,
-          })(newState, (newTransaction) => {
-            transaction = newTransaction;
-          });
+          [TOPIC_PREDICATE, TOPIC_PREDICATE_DEPRECATED].forEach((PREDICATE) =>
+            removeProperty({
+              resource,
+              property: {
+                predicate: PREDICATE.full,
+                object: sayDataFactory.namedNode(uri),
+              },
+              transaction,
+            })(newState, (newTransaction) => {
+              transaction = newTransaction;
+            }),
+          );
         });
       }
 
@@ -43,7 +49,7 @@ export const updateBesluitTopicResource = ({
         addProperty({
           resource,
           property: {
-            predicate: ELI(ELI_SUBJECT).full,
+            predicate: TOPIC_PREDICATE.full,
             object: sayDataFactory.namedNode(besluitTopic.uri),
           },
           transaction,

package/addon/plugins/besluit-topic-plugin/index.ts

@@ -1,3 +1,5 @@
 export type BesluitTopicPluginOptions = {
   endpoint: string;
+  /** Pass an explicit decision uri instead of finding it in the doc */
+  decisionUri?: string;
 };

package/addon/plugins/decision-plugin/commands/insert-article-container.ts

@@ -7,6 +7,7 @@ import { PROV } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import { buildArticleStructure } from '../utils/build-article-structure';
 import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { recalculateNumbers } from '../../structure-plugin/recalculate-structure-numbers';
 
 interface InsertArticleContainerArgs {
   intl: IntlService;
@@ -24,7 +25,11 @@ export default function insertArticleContainer({
     const nodeToInsert = schema.node(
       'block_rdfa',
       { rdfaNodeType: 'literal', __rdfaId: articleContainerId },
-      buildArticleStructure(schema, articleUriGenerator),
+      buildArticleStructure(
+        schema,
+        articleUriGenerator,
+        decisionLocation.node.attrs.subject,
+      ),
     );
 
     const tr = state.tr;
@@ -42,6 +47,7 @@ export default function insertArticleContainer({
           object: factory.literalNode(articleContainerId),
         },
       }),
+      recalculateNumbers,
     ]);
     if (dispatch && result.every((ok) => ok)) {
       dispatch(newTr.scrollIntoView());

package/addon/plugins/location-plugin/node-contents/address.ts

@@ -13,8 +13,10 @@ import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location
 import { Point } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { constructGeometrySpec } from './point';
 import { type NodeContentsUtils } from './';
+import { PNode } from '@lblod/ember-rdfa-editor';
+import { IncomingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 
-export const constructAddressSpec = (address: Address) => {
+export const constructAddressSpec = (address: Address, node: PNode) => {
   const housenumberNode = address.housenumber
     ? [
         ' ',
@@ -41,22 +43,26 @@ export const constructAddressSpec = (address: Address) => {
         }),
       ]
     : [];
-  // TODO Should dump and use spatial properly, but need to actually link into document...
+  const linkingSpans = ((node.attrs.backlinks as IncomingTriple[]) ?? []).map(
+    (bl) =>
+      span({
+        about: bl.subject.value,
+        property: bl.predicate,
+        resource: address.uri,
+      }),
+  );
+  // TODO Should dump the 'typeof', etc. as this is a hangover from being a variable
   return contentSpan(
     { resource: address.uri, typeof: LOCN('Address').full },
+    ...linkingSpans,
     span(
       {
-        property: DCT('spatial').full,
+        property: LOCN('thoroughfare').full,
       },
-      span(
-        {
-          property: LOCN('thoroughfare').full,
-        },
-        address.street,
-      ),
-      ...housenumberNode,
-      ...busnumberNode,
+      address.street,
     ),
+    ...housenumberNode,
+    ...busnumberNode,
     ', ',
     span(
       {
@@ -147,11 +153,10 @@ export const parseAddressElement =
       'property',
       ADRES('verwijstNaar'),
     )?.getAttribute('content');
-    const spatialNode = findChildWithRdfaAttribute(
-      addressNode,
-      'property',
-      DCT('spatial'),
-    );
+    // This node is no longer added, but we keep this lookup for compatibility
+    const spatialNode =
+      findChildWithRdfaAttribute(addressNode, 'property', DCT('spatial')) ||
+      addressNode;
     const street =
       spatialNode &&
       findChildWithRdfaAttribute(spatialNode, 'property', LOCN('thoroughfare'))

package/addon/plugins/location-plugin/node-contents/area.ts

@@ -1,6 +1,8 @@
+import { PNode } from '@lblod/ember-rdfa-editor';
+import { IncomingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
-  DCT,
   LOCN,
+  PROV,
   RDFS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { findChildWithRdfaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
@@ -12,13 +14,21 @@ import {
 import { constructGeometrySpec } from './point';
 import { type NodeContentsUtils } from './';
 
-export const constructAreaSpec = (area: Area) => {
+export const constructAreaSpec = (area: Area, node: PNode) => {
+  const linkingSpans = ((node.attrs.backlinks as IncomingTriple[]) ?? []).map(
+    (bl) =>
+      span({
+        rev: bl.predicate,
+        resource: bl.subject.value,
+      }),
+  );
   return span(
     {
       resource: area.uri,
       typeof: LOCN('Location').full,
-      property: DCT('spatial').full,
+      property: PROV('atLocation').full,
     },
+    ...linkingSpans,
     span(
       {
         property: RDFS('label').full,

package/addon/plugins/location-plugin/node-contents/place.ts

@@ -1,6 +1,8 @@
+import { PNode } from '@lblod/ember-rdfa-editor';
+import { IncomingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
-  DCT,
   LOCN,
+  PROV,
   RDFS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { findChildWithRdfaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
@@ -12,13 +14,21 @@ import {
 import { constructGeometrySpec } from './point';
 import { type NodeContentsUtils } from './';
 
-export const constructPlaceSpec = (place: Place) => {
+export const constructPlaceSpec = (place: Place, node: PNode) => {
+  const linkingSpans = ((node.attrs.backlinks as IncomingTriple[]) ?? []).map(
+    (bl) =>
+      span({
+        rev: bl.predicate,
+        resource: bl.subject.value,
+      }),
+  );
   return span(
     {
       resource: place.uri,
       typeof: LOCN('Location').full,
-      property: DCT('spatial').full,
+      property: PROV('atLocation').full,
     },
+    ...linkingSpans,
     span(
       {
         property: RDFS('label').full,

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

@@ -32,6 +32,7 @@ import {
 import {
   hasOutgoingNamedNodeTriple,
   hasRDFaAttribute,
+  Resource,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { contentSpan } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
 import AddressNodeviewComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/location-plugin/nodeview';
@@ -48,6 +49,7 @@ export interface LocationPluginConfig {
   defaultAddressUriRoot: string;
   defaultPlaceUriRoot: string;
   defaultPointUriRoot: string;
+  subjectTypesToLinkTo?: Resource[];
 }
 
 const parseDOM = (config: LocationPluginConfig): TagParseRule[] => {
@@ -166,11 +168,11 @@ const serialize =
       // it for now
       // const type = getOutgoingTriple(node.attrs, RDF('type'));
       if (value instanceof Address) {
-        contentNode = nodeContentsUtils.address.construct(value);
+        contentNode = nodeContentsUtils.address.construct(value, node);
       } else if (value instanceof Place) {
-        contentNode = nodeContentsUtils.place.construct(value);
+        contentNode = nodeContentsUtils.place.construct(value, node);
       } else if (value instanceof Area) {
-        contentNode = nodeContentsUtils.area.construct(value);
+        contentNode = nodeContentsUtils.area.construct(value, node);
       }
     }
     if (!contentNode) {

package/addon/plugins/location-plugin/utils/node-utils.ts

@@ -1,17 +1,63 @@
-import { SayController, NodeSelection } from '@lblod/ember-rdfa-editor';
+import { SayController, NodeSelection, PNode } from '@lblod/ember-rdfa-editor';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import {
   DCT,
   EXT,
+  PROV,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { v4 as uuidv4 } from 'uuid';
+import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
+import {
+  Resource,
+  hasOutgoingNamedNodeTriple,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 
-export function replaceSelectionWithAddress(
+/**
+ * Creates an 'OSLO location' node in place of the selection, along with the RDFa to create a triple
+ * with the nearest parent of one of the passed types as the subject and the predicate
+ * prov:atLocation. This doesn't work well with the RDFa tools, but since refactoring is required to
+ * clean up the RDFa structure inherited from variables and to make it work well with 'undo', this
+ * work was put off until then.
+ * @param controller - SayController
+ * @param label - label to add to the node
+ * @param templateMode - Whether to create template URIs in place of 'real' URIs
+ * @param subjectTypes - A list of Resources, each will be looked at in turn to compare the
+ * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
+ * used, etc.
+ */
+export function replaceSelectionWithLocation(
   controller: SayController,
   label?: string,
   templateMode?: boolean,
+  subjectTypes?: Resource[],
 ) {
+  let resourceToLink: { pos: number; node: PNode } | undefined;
+  subjectTypes?.forEach((subjectType) => {
+    if (!resourceToLink) {
+      resourceToLink = findAncestors(
+        controller.mainEditorState.selection.$from,
+        (node) => {
+          return hasOutgoingNamedNodeTriple(
+            node.attrs,
+            RDF('type'),
+            subjectType,
+          );
+        },
+      )[0];
+    }
+  });
+  const backlinks = !resourceToLink
+    ? []
+    : [
+        {
+          predicate: PROV('atLocation').full,
+          subject: sayDataFactory.resourceNode(
+            resourceToLink.node.attrs.subject,
+          ),
+        },
+      ];
+
   const mappingResource = `http://data.lblod.info/mappings/${
     templateMode ? '--ref-uuid4-' : ''
   }$${uuidv4()}`;
@@ -42,6 +88,7 @@ export function replaceSelectionWithAddress(
             object: sayDataFactory.literal(label || ''),
           },
         ],
+        backlinks,
       }),
     );
     if (tr.selection.$anchor.nodeBefore) {

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

@@ -30,11 +30,12 @@ const rdfaAware = true;
 export function getNameForStructureType(
   structureType: StructureType,
   number: number,
+  fullLengthArticles?: boolean,
   intl?: IntlService,
   locale?: string,
 ) {
   if (intl?.exists(`structure-plugin.types.${structureType}`, locale)) {
-    if (structureType === 'article' && number !== 1) {
+    if (structureType === 'article' && number !== 1 && !fullLengthArticles) {
       return intl?.t(`structure-plugin.shortened-article`, { locale });
     } else {
       return intl?.t(`structure-plugin.types.${structureType}`, { locale });
@@ -51,7 +52,14 @@ export type StructureType =
   | 'subsection'
   | 'paragraph';
 
-export const emberNodeConfig: () => EmberNodeConfig = () => {
+type StructureConfig = {
+  fullLengthArticles?: boolean;
+  onlyArticleSpecialName?: boolean;
+};
+
+export const emberNodeConfig: (config?: StructureConfig) => EmberNodeConfig = (
+  config,
+) => {
   return {
     name: 'structure',
     component: Structure as unknown as ComponentLike,
@@ -88,6 +96,13 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
       },
 
       sayRenderAs: { default: 'structure' },
+      fullLengthArticles: { default: config?.fullLengthArticles },
+      onlyArticleSpecialName: {
+        default:
+          config?.onlyArticleSpecialName === undefined
+            ? true
+            : config?.onlyArticleSpecialName,
+      },
     },
     serialize(node: PNode, state: EditorState) {
       const parser = new DOMParser();
@@ -106,6 +121,7 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
         ? getNameForStructureType(
             structureType,
             number,
+            node.attrs.fullLengthArticles,
             intlService,
             state.doc.attrs.lang,
           )
@@ -117,6 +133,8 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
             locale: state.doc.attrs.lang,
           })
         : structureName;
+      const displayOnlyArticle =
+        isOnlyArticle && node.attrs.onlyArticleSpecialName;
       if (titleHTML) {
         headerSpec = [
           tag,
@@ -149,20 +167,20 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
                 [
                   'span',
                   { 'data-say-structure-header-name': true },
-                  `${isOnlyArticle ? onlyArticleTitle : structureName} `,
+                  `${displayOnlyArticle ? onlyArticleTitle : structureName} `,
                 ],
               ]
             : []),
           [
             'span',
             {
-              style: isOnlyArticle ? 'display: none;' : '',
+              style: displayOnlyArticle ? 'display: none;' : '',
               'data-say-structure-header-number': true,
               property: ELI('number').full,
             },
             number.toString(),
           ],
-          isOnlyArticle ? '' : '.',
+          displayOnlyArticle ? '' : '.',
         ];
       }
       return renderRdfaAware({
@@ -297,3 +315,7 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
 };
 export const structure = createEmberNodeSpec(emberNodeConfig());
 export const structureView = createEmberNodeView(emberNodeConfig());
+export const structureWithConfig = (config?: StructureConfig) =>
+  createEmberNodeSpec(emberNodeConfig(config));
+export const structureViewWithConfig = (config?: StructureConfig) =>
+  createEmberNodeView(emberNodeConfig(config));

package/addon/services/roadsign-registry.ts

@@ -240,7 +240,7 @@ export default class RoadsignRegistryService extends Service {
   fetchSignsForMeasure = task(
     async (uri: string, endpoint: string, imageBaseUrl: string) => {
       const query = `
-SELECT ?uri ?code ?image ?zonality ?order (GROUP_CONCAT(?classification; SEPARATOR="|") AS ?classifications)
+SELECT ?uri ?code ?image ?zonality ?order ?type (GROUP_CONCAT(?classification; SEPARATOR="|") AS ?classifications)
 WHERE {
   <${uri}> ext:relation ?relation.
   ?relation a ext:MustUseRelation;

package/declarations/addon/components/besluit-topic-plugin/besluit-topic-toolbar-dropdown.d.ts

@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import { BesluitTopicPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin';
 import { BesluitTopic } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/fetchBesluitTopics';
+import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 type Args = {
     controller: SayController;
     options: BesluitTopicPluginOptions;
@@ -19,9 +20,14 @@ export default class BesluitTopicToolbarDropdownComponent extends Component<Args
     get controller(): SayController;
     get doc(): import("prosemirror-model").Node;
     get decisionRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
-    get showCard(): boolean;
+    get showCard(): string | import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
+    get options(): BesluitTopicPluginOptions;
+    get decisionUri(): string | undefined;
+    get currentTopicUris(): string[];
     topics: import("reactiveweb/function").State<Promise<BesluitTopic[]>>;
     findBesluitTopicsByUris(uris: string[], topics?: BesluitTopic[] | null): BesluitTopic[] | undefined;
+    findTopicTriples(attrs?: Record<string, unknown>): OutgoingTriple[];
+    matchTopicPredicate: (predicate: string) => boolean;
     updateBesluitTopic(): void;
     upsertBesluitTopic(selected: BesluitTopic[]): void;
     toggleCard(): void;

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

@@ -4,6 +4,7 @@ import Measure from '@lblod/ember-rdfa-editor-lblod-plugins/models/measure';
 import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
+import Sign from '@lblod/ember-rdfa-editor-lblod-plugins/models/sign';
 type Option = {
     label: string;
     value: string;
@@ -62,6 +63,7 @@ export default class RoadsignsModal extends Component<Args> {
         restartable: boolean;
     }, () => Promise<void>>;
     insertHtml(measure: Measure, zonalityValue: string, temporalValue: string): Promise<void>;
+    addTrafficSignPrefix(sign: Sign): string | undefined;
     goToPage(pageStart: number): void;
     search(): void;
 }

package/declarations/addon/components/structure-plugin/_private/structure.d.ts

@@ -25,6 +25,7 @@ export default class Structure extends Component<Sig> {
     get number(): any;
     get displayStructureName(): boolean;
     get structureType(): StructureType;
+    get fullLengthArticles(): boolean;
     get structureName(): string;
     get hasTitle(): any;
     get title(): string;

package/declarations/addon/models/sign.d.ts

@@ -1,12 +1,13 @@
 import { IBindings } from 'fetch-sparql-endpoint';
 export default class Sign {
     readonly code: string;
+    readonly type: string;
     readonly image: string;
     readonly classifications: string[];
     readonly uri: string;
     readonly order: string;
     readonly zonality?: string | undefined;
-    constructor(code: string, image: string, classifications: string[], uri: string, order: string, zonality?: string | undefined);
+    constructor(code: string, type: string, image: string, classifications: string[], uri: string, order: string, zonality?: string | undefined);
     static fromBinding(binding: IBindings): Sign;
     static processImage(url: string, imageBaseUrl: string): string;
 }

package/declarations/addon/plugins/besluit-topic-plugin/commands/update-besluit-topic-resource.d.ts

@@ -1,6 +1,7 @@
 import { BesluitTopic } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/fetchBesluitTopics';
 import { Command } from '@lblod/ember-rdfa-editor';
-export declare const ELI_SUBJECT = "is_about";
+export declare const TOPIC_PREDICATE: import("../../../utils/namespace").Resource;
+export declare const TOPIC_PREDICATE_DEPRECATED: import("../../../utils/namespace").Resource;
 export declare const updateBesluitTopicResource: ({ resource, previousTopics, newTopics, }: {
     resource: string;
     previousTopics: string[] | undefined;

package/declarations/addon/plugins/besluit-topic-plugin/index.d.ts

@@ -1,3 +1,5 @@
 export type BesluitTopicPluginOptions = {
     endpoint: string;
+    /** Pass an explicit decision uri instead of finding it in the doc */
+    decisionUri?: string;
 };

package/declarations/addon/plugins/location-plugin/node-contents/address.d.ts

@@ -1,6 +1,7 @@
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import { type NodeContentsUtils } from './';
-export declare const constructAddressSpec: (address: Address) => import("prosemirror-model").DOMOutputSpec;
+import { PNode } from '@lblod/ember-rdfa-editor';
+export declare const constructAddressSpec: (address: Address, node: PNode) => import("prosemirror-model").DOMOutputSpec;
 /** Parse pre-OSLO model rdfaAware address nodes */
 export declare const parseOldAddressElement: (nodeContentsUtils: NodeContentsUtils) => (addressNode: Element) => Address | undefined;
 export declare const parseAddressElement: (nodeContentsUtils: NodeContentsUtils) => (addressNode: Element | undefined) => Address | undefined;

package/declarations/addon/plugins/location-plugin/node-contents/area.d.ts

@@ -1,4 +1,5 @@
+import { PNode } from '@lblod/ember-rdfa-editor';
 import { Area } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { type NodeContentsUtils } from './';
-export declare const constructAreaSpec: (area: Area) => import("prosemirror-model").DOMOutputSpec;
+export declare const constructAreaSpec: (area: Area, node: PNode) => import("prosemirror-model").DOMOutputSpec;
 export declare const parseAreaElement: (nodeContentsUtils: NodeContentsUtils) => (element: Element) => Area | undefined;

package/declarations/addon/plugins/location-plugin/node-contents/index.d.ts

@@ -10,16 +10,16 @@ export declare class NodeContentsUtils {
     };
     fallbackPlaceUri: () => string;
     place: {
-        construct: (place: import("../utils/geo-helpers").Place) => import("prosemirror-model").DOMOutputSpec;
+        construct: (place: import("../utils/geo-helpers").Place, node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec;
         parse: (element: Element) => import("../utils/geo-helpers").Place | undefined;
     };
     area: {
-        construct: (area: import("../utils/geo-helpers").Area) => import("prosemirror-model").DOMOutputSpec;
+        construct: (area: import("../utils/geo-helpers").Area, node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec;
         parse: (element: Element) => import("../utils/geo-helpers").Area | undefined;
     };
     fallbackAddressUri: () => string;
     address: {
-        construct: (address: import("../utils/address-helpers").Address) => import("prosemirror-model").DOMOutputSpec;
+        construct: (address: import("../utils/address-helpers").Address, node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec;
         parseOld: (addressNode: Element) => import("../utils/address-helpers").Address | undefined;
         parse: (addressNode: Element | undefined) => import("../utils/address-helpers").Address | undefined;
     };

package/declarations/addon/plugins/location-plugin/node-contents/place.d.ts

@@ -1,4 +1,5 @@
+import { PNode } from '@lblod/ember-rdfa-editor';
 import { Place } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { type NodeContentsUtils } from './';
-export declare const constructPlaceSpec: (place: Place) => import("prosemirror-model").DOMOutputSpec;
+export declare const constructPlaceSpec: (place: Place, node: PNode) => import("prosemirror-model").DOMOutputSpec;
 export declare const parsePlaceElement: (nodeContentsUtils: NodeContentsUtils) => (element: Element) => Place | undefined;

package/declarations/addon/plugins/location-plugin/node.d.ts

@@ -1,7 +1,9 @@
+import { Resource } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 export interface LocationPluginConfig {
     defaultAddressUriRoot: string;
     defaultPlaceUriRoot: string;
     defaultPointUriRoot: string;
+    subjectTypesToLinkTo?: Resource[];
 }
 export declare const osloLocation: (config: LocationPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
 export declare const osloLocationView: (config: LocationPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;

package/declarations/addon/plugins/location-plugin/utils/node-utils.d.ts

@@ -1,2 +1,16 @@
 import { SayController } from '@lblod/ember-rdfa-editor';
-export declare function replaceSelectionWithAddress(controller: SayController, label?: string, templateMode?: boolean): void;
+import { Resource } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+/**
+ * Creates an 'OSLO location' node in place of the selection, along with the RDFa to create a triple
+ * with the nearest parent of one of the passed types as the subject and the predicate
+ * prov:atLocation. This doesn't work well with the RDFa tools, but since refactoring is required to
+ * clean up the RDFa structure inherited from variables and to make it work well with 'undo', this
+ * work was put off until then.
+ * @param controller - SayController
+ * @param label - label to add to the node
+ * @param templateMode - Whether to create template URIs in place of 'real' URIs
+ * @param subjectTypes - A list of Resources, each will be looked at in turn to compare the
+ * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
+ * used, etc.
+ */
+export declare function replaceSelectionWithLocation(controller: SayController, label?: string, templateMode?: boolean, subjectTypes?: Resource[]): void;

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

@@ -1,7 +1,14 @@
 import { EmberNodeConfig } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import IntlService from 'ember-intl/services/intl';
-export declare function getNameForStructureType(structureType: StructureType, number: number, intl?: IntlService, locale?: string): string;
+export declare function getNameForStructureType(structureType: StructureType, number: number, fullLengthArticles?: boolean, intl?: IntlService, locale?: string): string;
 export type StructureType = 'article' | 'chapter' | 'section' | 'subsection' | 'paragraph';
-export declare const emberNodeConfig: () => EmberNodeConfig;
+type StructureConfig = {
+    fullLengthArticles?: boolean;
+    onlyArticleSpecialName?: boolean;
+};
+export declare const emberNodeConfig: (config?: StructureConfig) => EmberNodeConfig;
 export declare const structure: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
 export declare const structureView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const structureWithConfig: (config?: StructureConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
+export declare const structureViewWithConfig: (config?: StructureConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "26.0.2",
+  "version": "26.1.0-dev.42b04a7414e40adf20dff16d76bdf1edff8ea5ff",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -105,7 +105,7 @@
     "@glint/template": "^1.4.0",
     "@graphy/content.ttl.write": "^4.3.7",
     "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "10.8.0",
+    "@lblod/ember-rdfa-editor": "10.9.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",

package/pnpm-lock.yaml

@@ -169,8 +169,8 @@ importers:
         specifier: 4.3.3
         version: 4.3.3
       '@lblod/ember-rdfa-editor':
-        specifier: 10.8.0
-        version: 10.8.0(2ef3gpurqxbttnmniw6grhzpuy)
+        specifier: 10.9.0
+        version: 10.9.0(2ef3gpurqxbttnmniw6grhzpuy)
       '@rdfjs/types':
         specifier: ^1.1.0
         version: 1.1.0
@@ -1595,8 +1595,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@lblod/ember-rdfa-editor@10.8.0':
-    resolution: {integrity: sha512-Xmcs8+e5sC9aDKz6hB5PslIePKizvh294O9A1JpKx00TzZhIFVBZeyW2baKiBpKpMjR/SyXj4WyryUKLYDldWw==}
+  '@lblod/ember-rdfa-editor@10.9.0':
+    resolution: {integrity: sha512-FHCV9/yYosA9c/dU1zQkHhscsysv5MuUQEZCZ3mayrVFN7EQyerJutC/apej0pqHx+dBL6HHtV+nTv3O3q8FSQ==}
     engines: {node: 16.* || 18.* || >= 20}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.4.2
@@ -10738,7 +10738,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@10.8.0(2ef3gpurqxbttnmniw6grhzpuy)':
+  '@lblod/ember-rdfa-editor@10.9.0(2ef3gpurqxbttnmniw6grhzpuy)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.4.2(yenc6o4wruytt4u2jbwlbsqcl4)
       '@babel/core': 7.24.7