Skip to content

Nautical Miles Added #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Nautical Miles Added #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Src/UnitsNet/GeneratedCode/Area.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ public double SquareInches
get { return SquareMeters / 0.00064516; }
}

/// <summary>
/// Get Area in SquareInternationalNauticalMiles.
/// </summary>
/// <remarks>Example: x = (y - b) / a where x is value in SquareInternationalNauticalMiles and y is value in base unit SquareMeters.</remarks>
public double SquareInternationalNauticalMiles
{
get { return SquareMeters / 3429904; }
}

/// <summary>
/// Get Area in SquareKilometers.
/// </summary>
Expand Down Expand Up @@ -161,6 +170,15 @@ public static Area FromSquareInches(double squareinches)
return new Area(0.00064516 * squareinches);
}

/// <summary>
/// Get Area from SquareInternationalNauticalMiles.
/// </summary>
/// <remarks>Example: y = ax + b where x is value in SquareInternationalNauticalMiles and y is value in base unit SquareMeters.</remarks>
public static Area FromSquareInternationalNauticalMiles(double squareinternationalnauticalmiles)
{
return new Area(3429904 * squareinternationalnauticalmiles);
}

/// <summary>
/// Get Area from SquareKilometers.
/// </summary>
Expand Down Expand Up @@ -224,6 +242,8 @@ public static Area From(double value, AreaUnit fromUnit)
return FromSquareFeet(value);
case AreaUnit.SquareInch:
return FromSquareInches(value);
case AreaUnit.SquareInternationalNauticalMile:
return FromSquareInternationalNauticalMiles(value);
case AreaUnit.SquareKilometer:
return FromSquareKilometers(value);
case AreaUnit.SquareMeter:
Expand Down Expand Up @@ -373,6 +393,8 @@ public double As(AreaUnit unit)
return SquareFeet;
case AreaUnit.SquareInch:
return SquareInches;
case AreaUnit.SquareInternationalNauticalMile:
return SquareInternationalNauticalMiles;
case AreaUnit.SquareKilometer:
return SquareKilometers;
case AreaUnit.SquareMeter:
Expand Down
22 changes: 22 additions & 0 deletions Src/UnitsNet/GeneratedCode/Length.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ public double Inches
get { return Meters / 0.0254; }
}

/// <summary>
/// Get Length in InternationalNauticalMiles.
/// </summary>
/// <remarks>Example: x = (y - b) / a where x is value in InternationalNauticalMiles and y is value in base unit Meters.</remarks>
public double InternationalNauticalMiles
{
get { return Meters / 1852; }
}

/// <summary>
/// Get Length in Kilometers.
/// </summary>
Expand Down Expand Up @@ -197,6 +206,15 @@ public static Length FromInches(double inches)
return new Length(0.0254 * inches);
}

/// <summary>
/// Get Length from InternationalNauticalMiles.
/// </summary>
/// <remarks>Example: y = ax + b where x is value in InternationalNauticalMiles and y is value in base unit Meters.</remarks>
public static Length FromInternationalNauticalMiles(double internationalnauticalmiles)
{
return new Length(1852 * internationalnauticalmiles);
}

/// <summary>
/// Get Length from Kilometers.
/// </summary>
Expand Down Expand Up @@ -296,6 +314,8 @@ public static Length From(double value, LengthUnit fromUnit)
return FromFeet(value);
case LengthUnit.Inch:
return FromInches(value);
case LengthUnit.InternationalNauticalMile:
return FromInternationalNauticalMiles(value);
case LengthUnit.Kilometer:
return FromKilometers(value);
case LengthUnit.Meter:
Expand Down Expand Up @@ -453,6 +473,8 @@ public double As(LengthUnit unit)
return Feet;
case LengthUnit.Inch:
return Inches;
case LengthUnit.InternationalNauticalMile:
return InternationalNauticalMiles;
case LengthUnit.Kilometer:
return Kilometers;
case LengthUnit.Meter:
Expand Down
12 changes: 12 additions & 0 deletions Src/UnitsNet/Units/AreaUnit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ public enum AreaUnit
Undefined = 0,

// Metric
/*
* International Nautical Mile
* "Beginning on July 1, 1954, the National Bureau of Standards will use
* the international Nautical Mile in lieu of the U.S. Nautical Mil. This deciision, replacint the U.S. Nautical
* Mile of 1,853.248 meters (6,080.20 feet) by the International Nautical Mile of 1,852 meters (6,076.10333... feet),
* confirms an official agreement between the Secretart of Commerce and the Secretary of Defense to use the
* Inernational Nautical Mile within their respective departments." http://physics.nist.gov/Pubs/SP447/app4.pdf
*/
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use

xml documentation instead of comment. This way intellisense can show this info too.

[I18n("en-US", "nmi²")]
[I18n("ru-RU", "нмиля²")]
[Length(3429904)]
SquareInternationalNauticalMile,

[I18n("en-US", "km²")]
[I18n("ru-RU", "км²")]
Expand Down
13 changes: 13 additions & 0 deletions Src/UnitsNet/Units/LengthUnit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ public enum LengthUnit
[I18n("nb-NO", "(ingen)")]
Undefined = 0,

/*
* International Nautical Mile
* "Beginning on July 1, 1954, the National Bureau of Standards will use
* the international Nautical Mile in lieu of the U.S. Nautical Mil. This deciision, replacint the U.S. Nautical
* Mile of 1,853.248 meters (6,080.20 feet) by the International Nautical Mile of 1,852 meters (6,076.10333... feet),
* confirms an official agreement between the Secretart of Commerce and the Secretary of Defense to use the
* Inernational Nautical Mile within their respective departments." http://physics.nist.gov/Pubs/SP447/app4.pdf
*/
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

[I18n("en-US", "nmi")]
[I18n("ru-RU", "нмиля")]
[Length(1852)]
InternationalNauticalMile,

[I18n("en-US", "km")]
[I18n("ru-RU", "км")]
[Length(1e3)]
Expand Down
Binary file added Src/UpgradeLog.htm
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions Tests/GeneratedCode/AreaTestsBase.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public abstract partial class AreaTestsBase
public abstract double SquareDecimetersInOneSquareMeter { get; }
public abstract double SquareFeetInOneSquareMeter { get; }
public abstract double SquareInchesInOneSquareMeter { get; }
public abstract double SquareInternationalNauticalMilesInOneSquareMeter { get; }
public abstract double SquareKilometersInOneSquareMeter { get; }
public abstract double SquareMetersInOneSquareMeter { get; }
public abstract double SquareMilesInOneSquareMeter { get; }
Expand All @@ -55,6 +56,7 @@ public void SquareMeterToAreaUnits()
Assert.AreEqual(SquareDecimetersInOneSquareMeter, squaremeter.SquareDecimeters, Delta);
Assert.AreEqual(SquareFeetInOneSquareMeter, squaremeter.SquareFeet, Delta);
Assert.AreEqual(SquareInchesInOneSquareMeter, squaremeter.SquareInches, Delta);
Assert.AreEqual(SquareInternationalNauticalMilesInOneSquareMeter, squaremeter.SquareInternationalNauticalMiles, Delta);
Assert.AreEqual(SquareKilometersInOneSquareMeter, squaremeter.SquareKilometers, Delta);
Assert.AreEqual(SquareMetersInOneSquareMeter, squaremeter.SquareMeters, Delta);
Assert.AreEqual(SquareMilesInOneSquareMeter, squaremeter.SquareMiles, Delta);
Expand All @@ -69,6 +71,7 @@ public void FromValueAndUnit()
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareDecimeter).SquareDecimeters, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareFoot).SquareFeet, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareInch).SquareInches, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareInternationalNauticalMile).SquareInternationalNauticalMiles, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareKilometer).SquareKilometers, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMeter).SquareMeters, Delta);
Assert.AreEqual(1, Area.From(1, AreaUnit.SquareMile).SquareMiles, Delta);
Expand All @@ -85,6 +88,7 @@ public void As()
Assert.AreEqual(SquareDecimetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareDecimeter), Delta);
Assert.AreEqual(SquareFeetInOneSquareMeter, squaremeter.As(AreaUnit.SquareFoot), Delta);
Assert.AreEqual(SquareInchesInOneSquareMeter, squaremeter.As(AreaUnit.SquareInch), Delta);
Assert.AreEqual(SquareInternationalNauticalMilesInOneSquareMeter, squaremeter.As(AreaUnit.SquareInternationalNauticalMile), Delta);
Assert.AreEqual(SquareKilometersInOneSquareMeter, squaremeter.As(AreaUnit.SquareKilometer), Delta);
Assert.AreEqual(SquareMetersInOneSquareMeter, squaremeter.As(AreaUnit.SquareMeter), Delta);
Assert.AreEqual(SquareMilesInOneSquareMeter, squaremeter.As(AreaUnit.SquareMile), Delta);
Expand All @@ -100,6 +104,7 @@ public void ConversionRoundTrip()
Assert.AreEqual(1, Area.FromSquareDecimeters(squaremeter.SquareDecimeters).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareFeet(squaremeter.SquareFeet).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareInches(squaremeter.SquareInches).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareInternationalNauticalMiles(squaremeter.SquareInternationalNauticalMiles).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareKilometers(squaremeter.SquareKilometers).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareMeters(squaremeter.SquareMeters).SquareMeters, Delta);
Assert.AreEqual(1, Area.FromSquareMiles(squaremeter.SquareMiles).SquareMeters, Delta);
Expand Down
5 changes: 5 additions & 0 deletions Tests/GeneratedCode/LengthTestsBase.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public abstract partial class LengthTestsBase
public abstract double DecimetersInOneMeter { get; }
public abstract double FeetInOneMeter { get; }
public abstract double InchesInOneMeter { get; }
public abstract double InternationalNauticalMilesInOneMeter { get; }
public abstract double KilometersInOneMeter { get; }
public abstract double MetersInOneMeter { get; }
public abstract double MicroinchesInOneMeter { get; }
Expand All @@ -59,6 +60,7 @@ public void MeterToLengthUnits()
Assert.AreEqual(DecimetersInOneMeter, meter.Decimeters, Delta);
Assert.AreEqual(FeetInOneMeter, meter.Feet, Delta);
Assert.AreEqual(InchesInOneMeter, meter.Inches, Delta);
Assert.AreEqual(InternationalNauticalMilesInOneMeter, meter.InternationalNauticalMiles, Delta);
Assert.AreEqual(KilometersInOneMeter, meter.Kilometers, Delta);
Assert.AreEqual(MetersInOneMeter, meter.Meters, Delta);
Assert.AreEqual(MicroinchesInOneMeter, meter.Microinches, Delta);
Expand All @@ -77,6 +79,7 @@ public void FromValueAndUnit()
Assert.AreEqual(1, Length.From(1, LengthUnit.Decimeter).Decimeters, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.Foot).Feet, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.Inch).Inches, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.InternationalNauticalMile).InternationalNauticalMiles, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.Kilometer).Kilometers, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.Meter).Meters, Delta);
Assert.AreEqual(1, Length.From(1, LengthUnit.Microinch).Microinches, Delta);
Expand All @@ -97,6 +100,7 @@ public void As()
Assert.AreEqual(DecimetersInOneMeter, meter.As(LengthUnit.Decimeter), Delta);
Assert.AreEqual(FeetInOneMeter, meter.As(LengthUnit.Foot), Delta);
Assert.AreEqual(InchesInOneMeter, meter.As(LengthUnit.Inch), Delta);
Assert.AreEqual(InternationalNauticalMilesInOneMeter, meter.As(LengthUnit.InternationalNauticalMile), Delta);
Assert.AreEqual(KilometersInOneMeter, meter.As(LengthUnit.Kilometer), Delta);
Assert.AreEqual(MetersInOneMeter, meter.As(LengthUnit.Meter), Delta);
Assert.AreEqual(MicroinchesInOneMeter, meter.As(LengthUnit.Microinch), Delta);
Expand All @@ -116,6 +120,7 @@ public void ConversionRoundTrip()
Assert.AreEqual(1, Length.FromDecimeters(meter.Decimeters).Meters, Delta);
Assert.AreEqual(1, Length.FromFeet(meter.Feet).Meters, Delta);
Assert.AreEqual(1, Length.FromInches(meter.Inches).Meters, Delta);
Assert.AreEqual(1, Length.FromInternationalNauticalMiles(meter.InternationalNauticalMiles).Meters, Delta);
Assert.AreEqual(1, Length.FromKilometers(meter.Kilometers).Meters, Delta);
Assert.AreEqual(1, Length.FromMeters(meter.Meters).Meters, Delta);
Assert.AreEqual(1, Length.FromMicroinches(meter.Microinches).Meters, Delta);
Expand Down