Add dimension RadiationSpecificActivity (openhab#3608)

* Add dimension RadiationSpecificActivity

This can be used e.g. for radon monitoring. The unit Bq/m3 was wrongly assigned to the dimension `Density` before.

Signed-off-by: Jan N. Klug <github@klug.nrw>

* improvement

Signed-off-by: Jan N. Klug <github@klug.nrw>

bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java

@@ -73,6 +73,7 @@
 import org.openhab.core.library.dimension.Density;
 import org.openhab.core.library.dimension.ElectricConductivity;
 import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.dimension.RadiationSpecificActivity;
 import org.openhab.core.library.dimension.VolumetricFlowRate;
 import org.openhab.core.library.types.PointType;
 import org.openhab.core.library.unit.ImperialUnits;
@@ -416,6 +417,7 @@ public static Map<Class<? extends Quantity<?>>, Map<SystemOfUnits, Unit<? extend
  addDefaultUnit(dimensionMap, RadiationDoseEffective.class, Units.SIEVERT);
  addDefaultUnit(dimensionMap, Radioactivity.class, Units.BECQUEREL);
  addDefaultUnit(dimensionMap, SolidAngle.class, Units.STERADIAN);
+ addDefaultUnit(dimensionMap, RadiationSpecificActivity.class, Units.BECQUEREL_PER_CUBIC_METRE);
  addDefaultUnit(dimensionMap, Speed.class, SIUnits.KILOMETRE_PER_HOUR, ImperialUnits.MILES_PER_HOUR);
  addDefaultUnit(dimensionMap, Temperature.class, SIUnits.CELSIUS, ImperialUnits.FAHRENHEIT);
  addDefaultUnit(dimensionMap, Time.class, Units.SECOND);

bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/RadiationSpecificActivity.java

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2010-2023 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.core.library.dimension;
+
+import javax.measure.Quantity;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * Define Specific activity type (basic unit is Bq/m^3)
+ *
+ * @author Jan N. Klug - Initial contribution
+ */
+@NonNullByDefault
+public interface RadiationSpecificActivity extends Quantity<RadiationSpecificActivity> {
+}

bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java

@@ -55,6 +55,7 @@
 import org.openhab.core.library.dimension.Density;
 import org.openhab.core.library.dimension.ElectricConductivity;
 import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.dimension.RadiationSpecificActivity;
 import org.openhab.core.library.dimension.VolumetricFlowRate;
 
 import si.uom.NonSI;
@@ -160,8 +161,14 @@ public final class Units extends CustomUnits {
  MultiplyConverter.ofRational(BigInteger.valueOf(100000), BigInteger.ONE)));
  public static final Unit<Pressure> MILLIBAR = addUnit(MetricPrefix.MILLI(BAR));
  public static final Unit<Radioactivity> BECQUEREL = addUnit(tech.units.indriya.unit.Units.BECQUEREL);
- public static final Unit<Density> BECQUEREL_PER_CUBIC_METRE = addUnit(new ProductUnit<>(
+ public static final Unit<Radioactivity> CURIE = addUnit(NonSI.CURIE);
+ public static final Unit<Radioactivity> MILLI_CURIE = addUnit(MetricPrefix.MILLI(CURIE));
+ public static final Unit<Radioactivity> MICRO_CURIE = addUnit(MetricPrefix.MICRO(CURIE));
+ public static final Unit<Radioactivity> NANO_CURIE = addUnit(MetricPrefix.NANO(CURIE));
+ public static final Unit<Radioactivity> PICO_CURIE = addUnit(MetricPrefix.PICO(CURIE));
+ public static final Unit<RadiationSpecificActivity> BECQUEREL_PER_CUBIC_METRE = addUnit(new ProductUnit<>(
  tech.units.indriya.unit.Units.BECQUEREL.divide(tech.units.indriya.unit.Units.CUBIC_METRE)));
+
  public static final Unit<RadiationDoseAbsorbed> GRAY = addUnit(tech.units.indriya.unit.Units.GRAY);
  public static final Unit<RadiationDoseEffective> SIEVERT = addUnit(tech.units.indriya.unit.Units.SIEVERT);
  public static final Unit<Speed> MILLIMETRE_PER_HOUR = addUnit(
@@ -234,6 +241,11 @@ public final class Units extends CustomUnits {
  SimpleUnitFormat.getInstance().label(BIT_PER_SECOND, "bit/s");
  SimpleUnitFormat.getInstance().label(BYTE, "B");
  SimpleUnitFormat.getInstance().alias(BYTE, "o");
+ SimpleUnitFormat.getInstance().label(CURIE, "Ci");
+ SimpleUnitFormat.getInstance().label(MILLI_CURIE, "mCi");
+ SimpleUnitFormat.getInstance().label(MICRO_CURIE, "µCi");
+ SimpleUnitFormat.getInstance().label(NANO_CURIE, "nCi");
+ SimpleUnitFormat.getInstance().label(PICO_CURIE, "pCi");
  SimpleUnitFormat.getInstance().label(CUBICMETRE_PER_DAY, "m³/d");
  SimpleUnitFormat.getInstance().label(CUBICMETRE_PER_HOUR, "m³/h");
  SimpleUnitFormat.getInstance().label(CUBICMETRE_PER_MINUTE, "m³/min");

bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java

@@ -387,6 +387,13 @@ public void testConductivity() {
  assertThat(converted.toString(), anyOf(is("10000 \u00B5S/cm"), is("10000 \u03BCS/cm")));
  }
 
+ @Test
+ public void testSpecificActivity() {
+ QuantityType<?> radon = QuantityType.valueOf("37 kBq/m³");
+ QuantityType<?> converted = radon.toUnit("nCi/l");
+ assertThat(converted.doubleValue(), is(closeTo(1.00, DEFAULT_ERROR)));
+ }
+
  @Test
  public void testRpm() {
  QuantityType<?> oneHertz = QuantityType.valueOf("60 rpm");