Merge branch 'feature/area-squm'

Author: angularsen

UnitsNet.Tests/CustomCode/AreaTests.cs

@@ -25,22 +25,27 @@ namespace UnitsNet.Tests.CustomCode
 {
     public class AreaTests : AreaTestsBase
     {
+
+        protected override double SquareKilometersInOneSquareMeter => 1E-6;
+
+        protected override double SquareMetersInOneSquareMeter => 1;
         protected override double SquareCentimetersInOneSquareMeter => 1E4;
 
         protected override double SquareDecimetersInOneSquareMeter => 1E2;
 
-        protected override double SquareFeetInOneSquareMeter => 10.76391;
+        protected override double SquareMillimetersInOneSquareMeter => 1E6;
 
-        protected override double SquareInchesInOneSquareMeter => 1550.003100;
+        protected override double SquareFeetInOneSquareMeter => 10.76391;
 
-        protected override double SquareKilometersInOneSquareMeter => 1E-6;
+        protected override double SquareMicrometersInOneSquareMeter
+        {
+            get { return 1E12; }
+        }
 
-        protected override double SquareMetersInOneSquareMeter => 1;
+        protected override double SquareInchesInOneSquareMeter => 1550.003100;
 
         protected override double SquareMilesInOneSquareMeter => 3.86102*1E-7;
 
-        protected override double SquareMillimetersInOneSquareMeter => 1E6;
-
         protected override double SquareYardsInOneSquareMeter => 1.19599;
 
         [Test]
@@ -50,4 +55,4 @@ public void AreaDividedByLengthEqualsLength()
             Assert.AreEqual(length, Length.FromMeters(10));
         }
     }
-}
+}

UnitsNet.Tests/GeneratedCode/AreaTestsBase.g.cs

@@ -42,6 +42,7 @@ public abstract partial class AreaTestsBase
         protected abstract double SquareInchesInOneSquareMeter { get; }
         protected abstract double SquareKilometersInOneSquareMeter { get; }
         protected abstract double SquareMetersInOneSquareMeter { get; }
+        protected abstract double SquareMicrometersInOneSquareMeter { get; }
         protected abstract double SquareMilesInOneSquareMeter { get; }
         protected abstract double SquareMillimetersInOneSquareMeter { get; }
         protected abstract double SquareYardsInOneSquareMeter { get; }
@@ -53,6 +54,7 @@ public abstract partial class AreaTestsBase
         protected virtual double SquareInchesTolerance { get { return 1e-5; } }
         protected virtual double SquareKilometersTolerance { get { return 1e-5; } }
         protected virtual double SquareMetersTolerance { get { return 1e-5; } }
+        protected virtual double SquareMicrometersTolerance { get { return 1e-5; } }
         protected virtual double SquareMilesTolerance { get { return 1e-5; } }
         protected virtual double SquareMillimetersTolerance { get { return 1e-5; } }
         protected virtual double SquareYardsTolerance { get { return 1e-5; } }
@@ -68,6 +70,7 @@ public void SquareMeterToAreaUnits()
             Assert.AreEqual(SquareInchesInOneSquareMeter, squaremeter.SquareInches, SquareInchesTolerance);
             Assert.AreEqual(SquareKilometersInOneSquareMeter, squaremeter.SquareKilometers, SquareKilometersTolerance);
             Assert.AreEqual(SquareMetersInOneSquareMeter, squaremeter.SquareMeters, SquareMetersTolerance);
+            Assert.AreEqual(SquareMicrometersInOneSquareMeter, squaremeter.SquareMicrometers, SquareMicrometersTolerance);
             Assert.AreEqual(SquareMilesInOneSquareMeter, squaremeter.SquareMiles, SquareMilesTolerance);
             Assert.AreEqual(SquareMillimetersInOneSquareMeter, squaremeter.SquareMillimeters, SquareMillimetersTolerance);
             Assert.AreEqual(SquareYardsInOneSquareMeter, squaremeter.SquareYards, SquareYardsTolerance);
@@ -82,6 +85,7 @@ public void FromValueAndUnit()
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareInch).SquareInches, SquareInchesTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareKilometer).SquareKilometers, SquareKilometersTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMeter).SquareMeters, SquareMetersTolerance);
+            Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMicrometer).SquareMicrometers, SquareMicrometersTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMile).SquareMiles, SquareMilesTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMillimeter).SquareMillimeters, SquareMillimetersTolerance);
             Assert.AreEqual(1, Area.From(1, AreaUnit.SquareYard).SquareYards, SquareYardsTolerance);
@@ -97,6 +101,7 @@ public void As()
             Assert.AreEqual(SquareInchesInOneSquareMeter, squaremeter.As(AreaUnit.SquareInch), SquareInchesTolerance);
             Assert.AreEqual(SquareKilometersInOneSquareMeter, squaremeter.As(AreaUnit.SquareKilometer), SquareKilometersTolerance);
             Assert.AreEqual(SquareMetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareMeter), SquareMetersTolerance);
+            Assert.AreEqual(SquareMicrometersInOneSquareMeter, squaremeter.As(AreaUnit.SquareMicrometer), SquareMicrometersTolerance);
             Assert.AreEqual(SquareMilesInOneSquareMeter, squaremeter.As(AreaUnit.SquareMile), SquareMilesTolerance);
             Assert.AreEqual(SquareMillimetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareMillimeter), SquareMillimetersTolerance);
             Assert.AreEqual(SquareYardsInOneSquareMeter, squaremeter.As(AreaUnit.SquareYard), SquareYardsTolerance);
@@ -112,6 +117,7 @@ public void ConversionRoundTrip()
             Assert.AreEqual(1, Area.FromSquareInches(squaremeter.SquareInches).SquareMeters, SquareInchesTolerance);
             Assert.AreEqual(1, Area.FromSquareKilometers(squaremeter.SquareKilometers).SquareMeters, SquareKilometersTolerance);
             Assert.AreEqual(1, Area.FromSquareMeters(squaremeter.SquareMeters).SquareMeters, SquareMetersTolerance);
+            Assert.AreEqual(1, Area.FromSquareMicrometers(squaremeter.SquareMicrometers).SquareMeters, SquareMicrometersTolerance);
             Assert.AreEqual(1, Area.FromSquareMiles(squaremeter.SquareMiles).SquareMeters, SquareMilesTolerance);
             Assert.AreEqual(1, Area.FromSquareMillimeters(squaremeter.SquareMillimeters).SquareMeters, SquareMillimetersTolerance);
             Assert.AreEqual(1, Area.FromSquareYards(squaremeter.SquareYards).SquareMeters, SquareYardsTolerance);

UnitsNet/GeneratedCode/Enums/AreaUnit.g.cs

@@ -31,6 +31,7 @@ public enum AreaUnit
         SquareInch,
         SquareKilometer,
         SquareMeter,
+        SquareMicrometer,
         SquareMile,
         SquareMillimeter,
         SquareYard,

UnitsNet/GeneratedCode/UnitClasses/Area.g.cs

@@ -102,6 +102,14 @@ public double SquareMeters
             get { return _squareMeters; }
         }
 
+        /// <summary>
+        ///     Get Area in SquareMicrometers.
+        /// </summary>
+        public double SquareMicrometers
+        {
+            get { return _squareMeters/1e-12; }
+        }
+
         /// <summary>
         ///     Get Area in SquareMiles.
         /// </summary>
@@ -183,6 +191,14 @@ public static Area FromSquareMeters(double squaremeters)
             return new Area(squaremeters);
         }
 
+        /// <summary>
+        ///     Get Area from SquareMicrometers.
+        /// </summary>
+        public static Area FromSquareMicrometers(double squaremicrometers)
+        {
+            return new Area(squaremicrometers*1e-12);
+        }
+
         /// <summary>
         ///     Get Area from SquareMiles.
         /// </summary>
@@ -230,6 +246,8 @@ public static Area From(double value, AreaUnit fromUnit)
                     return FromSquareKilometers(value);
                 case AreaUnit.SquareMeter:
                     return FromSquareMeters(value);
+                case AreaUnit.SquareMicrometer:
+                    return FromSquareMicrometers(value);
                 case AreaUnit.SquareMile:
                     return FromSquareMiles(value);
                 case AreaUnit.SquareMillimeter:
@@ -381,6 +399,8 @@ public double As(AreaUnit unit)
                     return SquareKilometers;
                 case AreaUnit.SquareMeter:
                     return SquareMeters;
+                case AreaUnit.SquareMicrometer:
+                    return SquareMicrometers;
                 case AreaUnit.SquareMile:
                     return SquareMiles;
                 case AreaUnit.SquareMillimeter:

UnitsNet/GeneratedCode/UnitSystem.Default.g.cs

@@ -193,6 +193,12 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                                 new AbbreviationsForCulture("en-US", "m²"),
                                 new AbbreviationsForCulture("ru-RU", "м²"),
                             }),
+                        new CulturesForEnumValue((int) AreaUnit.SquareMicrometer,
+                            new[]
+                            {
+                                new AbbreviationsForCulture("en-US", "µm²"),
+                                new AbbreviationsForCulture("ru-RU", "мкм²"),
+                            }),
                         new CulturesForEnumValue((int) AreaUnit.SquareMile,
                             new[]
                             {