Merge pull request #1229 from visualize-admin/refactor/consider-quad-…

…hasunit

chore: Also retrieve dimension units via qudt:hasUnit

CHANGELOG.md

@@ -11,6 +11,8 @@ You can also check the [release page](https://github.com/visualize-admin/visuali
 
 - Style
   - Map now outlines shapes on hover, instead of changing their colors
+- Maintenance
+  - Added retrieval of dimension units via `qudt:hasUnit` (but kept `qudt:unit` for backward compatibility)
 
 # [3.23.0] - 2023-10-17
 

app/docs/rdf-to-visualize.mdx

@@ -244,7 +244,7 @@ the charts that rely on those cubes will continue to work.
   not work anymore. Here are the properties of a dimension that should not change:
 
   - `a`: Dimension type
-  - `qudt:unit`: Unit
+  - `qudt:hasUnit`: Unit
   - `qudt:scaleType`: Scale type
   - `shacl:datatype`: Data type
   - `meta:dataKind`: Data kind

app/rdf/parse.ts

@@ -244,7 +244,8 @@ export const parseCubeDimension = ({
     .out(ns.rdf.type)
     .terms.some((t) => t.equals(ns.cube.MeasureDimension));
 
-  const unitTerm = dim.out(ns.qudt.unit).term;
+  // Keeping qudt:unit format for backwards compatibility.
+  const unitTerm = dim.out(ns.qudt.unit).term ?? dim.out(ns.qudt.hasUnit).term;
   const unit = unitTerm ? units?.get(unitTerm.value) : undefined;
   const unitLabel = unit?.label?.value;
 

app/rdf/queries.ts

@@ -123,7 +123,9 @@ export const getResolvedCube = async ({
 };
 
 const getDimensionUnits = (d: CubeDimension) => {
-  const t = d.out(ns.qudt.unit).term;
+  // Keeping qudt:unit format for backwards compatibility.
+  const t = d.out(ns.qudt.unit).term ?? d.out(ns.qudt.hasUnit).term;
+
   return t ? [t] : [];
 };