Merge branch 'master' of https://github.com/mludlum/UnitsNet

mludlum · mludlum · commit e2b7f2a63fdd · 2016-12-12T11:32:17.000-05:00
diff --git a/UnitsNet.Tests/CustomCode/LengthTests.cs b/UnitsNet.Tests/CustomCode/LengthTests.cs
@@ -33,7 +33,7 @@ public class LengthTests : LengthTestsBase
 
         protected override double FeetInOneMeter => 3.28084;
 
-        protected override double USSurveyFeetInOneMeter => 3.2808333333465;
+        protected override double USSurveyFeetInOneMeter => 3937/1200;
 
         protected override double InchesInOneMeter => 39.37007874;
 
diff --git a/UnitsNet/GeneratedCode/UnitClasses/Length.g.cs b/UnitsNet/GeneratedCode/UnitClasses/Length.g.cs
@@ -219,7 +219,7 @@ public double NauticalMiles
         /// </summary>
         public double USSurveyFeet
         {
-            get { return _meters/0.3048006096; }
+            get { return _meters*3937/1200; }
         }
 
         /// <summary>
@@ -348,7 +348,7 @@ public static Length FromNauticalMiles(double nauticalmiles)
         /// </summary>
         public static Length FromUSSurveyFeet(double ussurveyfeet)
         {
-            return new Length(ussurveyfeet*0.3048006096);
+            return new Length(ussurveyfeet*1200/3937);
         }
 
         /// <summary>
diff --git a/UnitsNet/Scripts/UnitDefinitions/Length.json b/UnitsNet/Scripts/UnitDefinitions/Length.json
@@ -72,8 +72,8 @@
     {
       "SingularName": "USSurveyFoot",
       "PluralName": "USSurveyFeet",
-      "FromUnitToBaseFunc": "x*0.3048006096",
-      "FromBaseToUnitFunc": "x/0.3048006096",
+      "FromUnitToBaseFunc": "x*1200/3937",
+      "FromBaseToUnitFunc": "x*3937/1200",
       "Localization": [
         {
           "Culture": "en-US",

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public double NauticalMiles`
`219`	`219`	`/// </summary>`
`220`	`220`	`public double USSurveyFeet`
`221`	`221`	`{`
`222`		`- get { return _meters/0.3048006096; }`
	`222`	`+ get { return _meters*3937/1200; }`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`/// <summary>`
`@@ -348,7 +348,7 @@ public static Length FromNauticalMiles(double nauticalmiles)`
`348`	`348`	`/// </summary>`
`349`	`349`	`public static Length FromUSSurveyFeet(double ussurveyfeet)`
`350`	`350`	`{`
`351`		`- return new Length(ussurveyfeet*0.3048006096);`
	`351`	`+ return new Length(ussurveyfeet*1200/3937);`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@`
`72`	`72`	`{`
`73`	`73`	`"SingularName": "USSurveyFoot",`
`74`	`74`	`"PluralName": "USSurveyFeet",`
`75`		`- "FromUnitToBaseFunc": "x*0.3048006096",`
`76`		`- "FromBaseToUnitFunc": "x/0.3048006096",`
	`75`	`+ "FromUnitToBaseFunc": "x*1200/3937",`
	`76`	`+ "FromBaseToUnitFunc": "x*3937/1200",`
`77`	`77`	`"Localization": [`
`78`	`78`	`{`
`79`	`79`	`"Culture": "en-US",`