@lblod/ember-rdfa-editor-lblod-plugins 26.1.0 → 26.2.0-dev.16cddd6d5fcdc7aa598379fc90d0de0daf82c3f8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 26.2.0
+
+### Minor Changes
+
+- [#517](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/517) [`88cb173`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/88cb173d67ddc613ace5cc8c4c595d26e7497306) Thanks [@piemonkey](https://github.com/piemonkey)! - Add configuration option to location plugin to automatically link to resources in the wider document
+
+- [#517](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/517) [`42b04a7`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/42b04a7414e40adf20dff16d76bdf1edff8ea5ff) Thanks [@piemonkey](https://github.com/piemonkey)! - Use prov:atLocation predicate for locations instead of dct:spatial
+
+- [#517](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/517) [`eaf74bc`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/eaf74bc9e20a9e5922f7fa76e486d3aba3dc2881) Thanks [@piemonkey](https://github.com/piemonkey)! - Remove vestigual 'mapping' RDFa from oslo location nodes as they are no longer 'variables' so no longer need it
+
+### Patch Changes
+
+- [#519](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/519) [`b864e08`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/b864e08ff36349331169fb3ec0c45a754ee8038d) Thanks [@piemonkey](https://github.com/piemonkey)! - Fix oslo location addresses to have correct RDFa by generating a URI instead of misusing the vlaanderen address uri
+
 ## 26.1.0
 
 ### Minor Changes

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';
@@ -153,13 +153,11 @@ export default class LocationPluginInsertComponent extends Component<Signature>
   get disableConfirm() {
     switch (this.locationType) {
       case 'place':
-        return (
-          !this.selectedLocationNode || !this.placeName || !this.chosenPoint
-        );
+        return !this.placeName || !this.chosenPoint;
       case 'address':
-        return !this.selectedLocationNode || !this.addressToInsert;
+        return !this.addressToInsert;
       default:
-        return !this.selectedLocationNode || !this.placeName || !this.savedArea;
+        return !this.placeName || !this.savedArea;
     }
   }
 
@@ -189,15 +187,6 @@ export default class LocationPluginInsertComponent extends Component<Signature>
 
   @action
   insertOrEditAddress() {
-    if (!this.selectedLocationNode) {
-      replaceSelectionWithAddress(
-        this.controller,
-        this.intl.t('location-plugin.default-label', {
-          locale: this.documentLanguage,
-        }),
-        this.args.templateMode,
-      );
-    }
     this.modalOpen = true;
   }
 
@@ -221,48 +210,47 @@ export default class LocationPluginInsertComponent extends Component<Signature>
 
   @action
   confirmLocation() {
-    if (this.selectedLocationNode) {
-      let toInsert: Address | Place | Area | undefined;
-      const { pos } = this.selectedLocationNode;
-      if (this.locationType === 'address' && this.addressToInsert) {
-        toInsert = this.addressToInsert;
-      } else if (
-        this.locationType === 'place' &&
-        this.chosenPoint?.global &&
-        this.placeName
-      ) {
-        toInsert = new Place({
-          uri: this.nodeContentsUtils.fallbackPlaceUri(),
-          name: this.placeName,
-          location: new Point({
-            uri: this.nodeContentsUtils.fallbackGeometryUri(),
-            location: {
-              lambert: convertWGS84CoordsToLambert(this.chosenPoint.global),
-              global: this.chosenPoint?.global,
-            },
-          }),
-        });
-        this.chosenPoint = undefined;
-      } else if (
-        this.locationType === 'area' &&
-        this.savedArea &&
-        this.placeName
-      ) {
-        toInsert = new Area({
-          uri: this.nodeContentsUtils.fallbackPlaceUri(),
-          name: this.placeName,
-          shape: new Polygon({
-            uri: this.nodeContentsUtils.fallbackGeometryUri(),
-            locations: this.savedArea,
-          }),
-        });
-      }
-      if (toInsert) {
-        this.controller.withTransaction((tr) => {
-          return tr.setNodeAttribute(pos, 'value', toInsert);
-        });
-        this.modalOpen = false;
-      }
+    let toInsert: Address | Place | Area | undefined;
+    if (this.locationType === 'address' && this.addressToInsert) {
+      toInsert = this.addressToInsert;
+    } else if (
+      this.locationType === 'place' &&
+      this.chosenPoint?.global &&
+      this.placeName
+    ) {
+      toInsert = new Place({
+        uri: this.nodeContentsUtils.fallbackPlaceUri(),
+        name: this.placeName,
+        location: new Point({
+          uri: this.nodeContentsUtils.fallbackGeometryUri(),
+          location: {
+            lambert: convertWGS84CoordsToLambert(this.chosenPoint.global),
+            global: this.chosenPoint?.global,
+          },
+        }),
+      });
+      this.chosenPoint = undefined;
+    } else if (
+      this.locationType === 'area' &&
+      this.savedArea &&
+      this.placeName
+    ) {
+      toInsert = new Area({
+        uri: this.nodeContentsUtils.fallbackPlaceUri(),
+        name: this.placeName,
+        shape: new Polygon({
+          uri: this.nodeContentsUtils.fallbackGeometryUri(),
+          locations: this.savedArea,
+        }),
+      });
+    }
+    if (toInsert) {
+      replaceSelectionWithLocation(
+        this.controller,
+        toInsert,
+        this.args.config.subjectTypesToLinkTo,
+      );
+      this.modalOpen = false;
     }
   }
 

package/addon/components/variable-plugin/address/insert-variable.ts

@@ -11,6 +11,10 @@ type Args = {
   templateMode?: boolean;
 };
 
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
   @service declare intl: IntlService;
   @tracked label?: string;

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

@@ -5,10 +5,7 @@ import {
   LOCN,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { findChildWithRdfaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import {
-  contentSpan,
-  span,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
+import { span } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
 import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/address-helpers';
 import { Point } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { constructGeometrySpec } from './point';
@@ -33,30 +30,24 @@ export const constructAddressSpec = (address: Address) => {
         ),
       ]
     : [];
-  const idNode = address.uri
+  const belgianUriNode = address.belgianAddressUri
     ? [
         span({
           property: ADRES('verwijstNaar').full,
-          content: address.uri,
+          resource: address.belgianAddressUri,
         }),
       ]
     : [];
-  // TODO Should dump and use spatial properly, but need to actually link into document...
-  return contentSpan(
+  return span(
     { resource: address.uri, typeof: LOCN('Address').full },
     span(
       {
-        property: DCT('spatial').full,
+        property: LOCN('thoroughfare').full,
       },
-      span(
-        {
-          property: LOCN('thoroughfare').full,
-        },
-        address.street,
-      ),
-      ...housenumberNode,
-      ...busnumberNode,
+      address.street,
     ),
+    ...housenumberNode,
+    ...busnumberNode,
     ', ',
     span(
       {
@@ -72,7 +63,7 @@ export const constructAddressSpec = (address: Address) => {
       },
       address.municipality,
     ),
-    ...idNode,
+    ...belgianUriNode,
     constructGeometrySpec(address.location, ADRES('positie')),
   );
 };
@@ -81,7 +72,10 @@ export const constructAddressSpec = (address: Address) => {
 export const parseOldAddressElement =
   (nodeContentsUtils: NodeContentsUtils) =>
   (addressNode: Element): Address | undefined => {
-    const uri = addressNode.getAttribute('resource');
+    // Belgian address URI was incorrectly used as the resource URI, so we correct that by
+    // generating a new one
+    const uri = nodeContentsUtils.fallbackAddressUri();
+    const belgianAddressUri = addressNode.getAttribute('resource') ?? undefined;
     const street = findChildWithRdfaAttribute(
       addressNode,
       'property',
@@ -124,7 +118,8 @@ export const parseOldAddressElement =
 
     if (street && municipality && zipcode && location) {
       return new Address({
-        uri: uri ?? nodeContentsUtils.fallbackAddressUri(),
+        uri,
+        belgianAddressUri,
         street,
         housenumber: housenumber ?? undefined,
         zipcode,
@@ -142,16 +137,27 @@ export const parseAddressElement =
   (addressNode: Element | undefined): Address | undefined => {
     if (!addressNode) return undefined;
 
-    const uri = findChildWithRdfaAttribute(
+    let uri = addressNode.getAttribute('resource');
+    const belgianAddressNode = findChildWithRdfaAttribute(
       addressNode,
       'property',
       ADRES('verwijstNaar'),
-    )?.getAttribute('content');
-    const spatialNode = findChildWithRdfaAttribute(
-      addressNode,
-      'property',
-      DCT('spatial'),
     );
+    // In the past this was stored as a string relationship, which matches the example in the model
+    // docs but not the diagram, so look for either here
+    const belgianAddressUri =
+      belgianAddressNode?.getAttribute('resource') ??
+      belgianAddressNode?.getAttribute('content') ??
+      undefined;
+    if (uri === belgianAddressUri) {
+      // An older version of this code mistakenly used the belgian address URI as the resource URI,
+      // so if they are the same, generate a new one
+      uri = nodeContentsUtils.fallbackAddressUri();
+    }
+    // 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'))
@@ -191,6 +197,7 @@ export const parseAddressElement =
     if (street && municipality && zipcode && location instanceof Point) {
       return new Address({
         uri: uri ?? nodeContentsUtils.fallbackAddressUri(),
+        belgianAddressUri,
         street,
         housenumber: housenumber ?? undefined,
         zipcode,

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

@@ -1,5 +1,4 @@
 import {
-  DCT,
   LOCN,
   RDFS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -17,7 +16,6 @@ export const constructAreaSpec = (area: Area) => {
     {
       resource: area.uri,
       typeof: LOCN('Location').full,
-      property: DCT('spatial').full,
     },
     span(
       {
@@ -31,12 +29,7 @@ export const constructAreaSpec = (area: Area) => {
 
 export const parseAreaElement =
   (nodeContentsUtils: NodeContentsUtils) =>
-  (element: Element): Area | undefined => {
-    const placeNode = findChildWithRdfaAttribute(
-      element,
-      'typeof',
-      LOCN('Location'),
-    );
+  (placeNode: Element): Area | undefined => {
     const placeResource = placeNode?.getAttribute('resource');
     const label =
       placeNode &&

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

@@ -1,5 +1,4 @@
 import {
-  DCT,
   LOCN,
   RDFS,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
@@ -17,7 +16,6 @@ export const constructPlaceSpec = (place: Place) => {
     {
       resource: place.uri,
       typeof: LOCN('Location').full,
-      property: DCT('spatial').full,
     },
     span(
       {
@@ -31,12 +29,7 @@ export const constructPlaceSpec = (place: Place) => {
 
 export const parsePlaceElement =
   (nodeContentsUtils: NodeContentsUtils) =>
-  (element: Element): Place | undefined => {
-    const placeNode = findChildWithRdfaAttribute(
-      element,
-      'typeof',
-      LOCN('Location'),
-    );
+  (placeNode: Element): Place | undefined => {
     const placeResource = placeNode?.getAttribute('resource');
     const label =
       placeNode &&

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

@@ -18,8 +18,10 @@ import {
   renderRdfaAware,
 } from '@lblod/ember-rdfa-editor/core/schema';
 import {
+  ADRES,
   DCT,
   EXT,
+  LOCN,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import {
@@ -32,6 +34,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';
@@ -41,6 +44,7 @@ import {
   Area,
   Place,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
+import { findChildWithRdfaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { NodeContentsUtils } from './node-contents';
 import { recreateVariableUris } from '../variable-plugin/utils/recreate-variable-uris';
 
@@ -48,11 +52,49 @@ export interface LocationPluginConfig {
   defaultAddressUriRoot: string;
   defaultPlaceUriRoot: string;
   defaultPointUriRoot: string;
+  subjectTypesToLinkTo?: Resource[];
 }
 
 const parseDOM = (config: LocationPluginConfig): TagParseRule[] => {
   const nodeContentsUtils = new NodeContentsUtils(config);
   return [
+    {
+      tag: 'span',
+      getAttrs(node: HTMLElement) {
+        const attrs = getRdfaAttrs(node, { rdfaAware: true });
+        if (!attrs) {
+          return false;
+        }
+        const contentContainer = node.querySelector(
+          '[data-content-container="true"]',
+        );
+        if (attrs.rdfaNodeType !== 'resource') {
+          return false;
+        }
+        if (contentContainer) {
+          const location =
+            nodeContentsUtils.address.parse(contentContainer.children[0]) ||
+            nodeContentsUtils.place.parse(contentContainer.children[0]) ||
+            nodeContentsUtils.area.parse(contentContainer.children[0]);
+          if (location) {
+            // In the past this was stored as a string relationship, which matches the example in the model
+            // docs but not the diagram, so correct it to a URI here
+            const properties = attrs.properties?.filter(
+              (prop) =>
+                !ADRES('verwijstNaar').matches(prop.predicate) ||
+                prop.object.termType === 'NamedNode',
+            );
+            return {
+              ...attrs,
+              properties,
+              value: location,
+            };
+          }
+        }
+        return false;
+      },
+    },
+    // Match 'variable style' node, with additional 'mapping' wrapper
     {
       tag: 'span',
       getAttrs(node: HTMLElement) {
@@ -80,10 +122,20 @@ const parseDOM = (config: LocationPluginConfig): TagParseRule[] => {
           const addressNode = [...dataContainer.children].find((el) =>
             hasRDFaAttribute(el, 'property', EXT('content')),
           );
-          const location =
-            nodeContentsUtils.address.parse(addressNode) ||
-            nodeContentsUtils.place.parse(dataContainer) ||
-            nodeContentsUtils.area.parse(dataContainer);
+          let location: Place | Area | Address | undefined =
+            nodeContentsUtils.address.parse(addressNode);
+          if (addressNode && !location) {
+            const placeNode = findChildWithRdfaAttribute(
+              addressNode,
+              'typeof',
+              LOCN('Location'),
+            );
+            if (placeNode) {
+              location =
+                nodeContentsUtils.place.parse(placeNode) ||
+                nodeContentsUtils.area.parse(placeNode);
+            }
+          }
           return {
             ...attrs,
             value:
@@ -161,10 +213,6 @@ const serialize =
     const { value } = node.attrs;
     let contentNode: DOMOutputSpec | undefined;
     if (value) {
-      // TODO we should be setting the type properly rather than using the address placeholder which
-      // does not have the correct RDFa properties but that's a bigger change, so just hack around
-      // it for now
-      // const type = getOutgoingTriple(node.attrs, RDF('type'));
       if (value instanceof Address) {
         contentNode = nodeContentsUtils.address.construct(value);
       } else if (value instanceof Place) {

package/addon/plugins/location-plugin/utils/address-helpers.ts

@@ -107,6 +107,7 @@ type AddressDetailResult = {
 
 export class Address {
   declare uri: string;
+  declare belgianAddressUri?: string;
   declare street: string;
   declare zipcode: string;
   declare municipality: string;
@@ -123,6 +124,7 @@ export class Address {
       | 'uri'
       | 'busnumber'
       | 'location'
+      | 'belgianAddressUri'
     >,
   ) {
     Object.assign(this, args);
@@ -264,6 +266,7 @@ export async function resolveStreet(
     if (streetinfo) {
       return new Address({
         uri: nodeContentsUtils.fallbackAddressUri(),
+        belgianAddressUri: `https://data.vlaanderen.be/id/straatnaam/${streetinfo.ID}`,
         street: unwrap(streetinfo.Thoroughfarename),
         municipality: streetinfo.Municipality,
         zipcode: unwrap(streetinfo.Zipcode),
@@ -321,7 +324,8 @@ export async function resolveAddress(
         busnumber: result.busnummer,
         zipcode: result.postinfo.objectId,
         municipality: result.gemeente.gemeentenaam.geografischeNaam.spelling,
-        uri: result.identificator.id,
+        uri: nodeContentsUtils.fallbackAddressUri(),
+        belgianAddressUri: result.identificator.id,
         location: new Point({
           uri: `${result.identificator.id}/1`,
           location: {

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

@@ -1,47 +1,73 @@
-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';
+import { Area, Place } from './geo-helpers';
+import { Address } from './address-helpers';
 
-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 toInsert - The object representing the location to insert
+ * @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,
+  toInsert: Place | Address | Area,
+  subjectTypes?: Resource[],
 ) {
-  const mappingResource = `http://data.lblod.info/mappings/${
-    templateMode ? '--ref-uuid4-' : ''
-  }$${uuidv4()}`;
-  const variableInstance = `http://data.lblod.info/variables/${
-    templateMode ? '--ref-uuid4-' : ''
-  }$${uuidv4()}`;
+  let resourceToLink: { pos: number; node: PNode } | undefined;
+  subjectTypes?.forEach((subjectType) => {
+    if (!resourceToLink) {
+      resourceToLink = findAncestors(
+        controller.mainEditorState.selection.$from,
+        (node) => {
+          if ('typeof' in node.attrs) {
+            return subjectType.matches(node.attrs.typeof);
+          }
+          return hasOutgoingNamedNodeTriple(
+            node.attrs,
+            RDF('type'),
+            subjectType,
+          );
+        },
+      )[0];
+    }
+  });
+  const backlinks = !resourceToLink
+    ? []
+    : [
+        {
+          predicate: PROV('atLocation').full,
+          subject: sayDataFactory.resourceNode(
+            resourceToLink.node.attrs.subject,
+          ),
+        },
+      ];
+
   controller.withTransaction((tr) => {
     tr.replaceSelectionWith(
       controller.schema.node('oslo_location', {
-        subject: mappingResource,
+        subject: toInsert.uri,
         rdfaNodeType: 'resource',
         __rdfaId: uuidv4(),
-        properties: [
-          {
-            predicate: RDF('type').full,
-            object: sayDataFactory.namedNode(EXT('Mapping').full),
-          },
-          {
-            predicate: EXT('instance').full,
-            object: sayDataFactory.namedNode(variableInstance),
-          },
-          {
-            predicate: DCT('type').full,
-            object: sayDataFactory.literal('address'),
-          },
-          {
-            predicate: EXT('label').full,
-            object: sayDataFactory.literal(label || ''),
-          },
-        ],
+        value: toInsert,
+        properties: [],
+        backlinks,
       }),
     );
     if (tr.selection.$anchor.nodeBefore) {

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

@@ -402,5 +402,13 @@ const emberNodeConfig: EmberNodeConfig = {
   parseDOM,
 };
 
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export const address = createEmberNodeSpec(emberNodeConfig);
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export const addressView = createEmberNodeView(emberNodeConfig);

package/declarations/addon/components/variable-plugin/address/insert-variable.d.ts

@@ -5,6 +5,10 @@ type Args = {
     controller: SayController;
     templateMode?: boolean;
 };
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
     intl: IntlService;
     label?: string;

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

@@ -1,4 +1,4 @@
 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 parseAreaElement: (nodeContentsUtils: NodeContentsUtils) => (element: Element) => Area | undefined;
+export declare const parseAreaElement: (nodeContentsUtils: NodeContentsUtils) => (placeNode: Element) => Area | undefined;

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

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

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

@@ -1,4 +1,4 @@
 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 parsePlaceElement: (nodeContentsUtils: NodeContentsUtils) => (element: Element) => Place | undefined;
+export declare const parsePlaceElement: (nodeContentsUtils: NodeContentsUtils) => (placeNode: 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/address-helpers.d.ts

@@ -21,13 +21,14 @@ type AddressSearchResult = {
 };
 export declare class Address {
     uri: string;
+    belgianAddressUri?: string;
     street: string;
     zipcode: string;
     municipality: string;
     housenumber?: string;
     busnumber?: string;
     location: Point;
-    constructor(args: Pick<Address, 'street' | 'housenumber' | 'zipcode' | 'municipality' | 'uri' | 'busnumber' | 'location'>);
+    constructor(args: Pick<Address, 'street' | 'housenumber' | 'zipcode' | 'municipality' | 'uri' | 'busnumber' | 'location' | 'belgianAddressUri'>);
     get formatted(): string;
     sameAs(other?: Pick<Address, 'street' | 'housenumber' | 'busnumber' | 'municipality'> | null): boolean;
     get hasHouseNumber(): boolean;

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

@@ -1,2 +1,17 @@
 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';
+import { Area, Place } from './geo-helpers';
+import { Address } from './address-helpers';
+/**
+ * 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 toInsert - The object representing the location to insert
+ * @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, toInsert: Place | Address | Area, subjectTypes?: Resource[]): void;

package/declarations/addon/plugins/variable-plugin/variables/address.d.ts

@@ -1,2 +1,10 @@
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export declare const address: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
+/**
+ * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
+ * linking to the document it is in.
+ */
 export declare const addressView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "26.1.0",
+  "version": "26.2.0-dev.16cddd6d5fcdc7aa598379fc90d0de0daf82c3f8",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",