Updating NPack.dll

Adding an implementation of IAffineTransformMatrix and IMatrixOperations from NPack
SharpMap · May 9, 2008 · bf20b3c · bf20b3c
1 parent bf4e775
commit bf20b3c
Show file tree

Hide file tree

Showing 48 changed files with 3,773 additions and 1,608 deletions.
diff --git a/ExternalReferences/Debug_Net20/NPack.XML b/ExternalReferences/Debug_Net20/NPack.XML
diff --git a/ExternalReferences/Debug_Net20/NPack.dll b/ExternalReferences/Debug_Net20/NPack.dll
diff --git a/ExternalReferences/Debug_Net20/NPack.pdb b/ExternalReferences/Debug_Net20/NPack.pdb
diff --git a/ExternalReferences/Debug_Net35/NPack.XML b/ExternalReferences/Debug_Net35/NPack.XML
diff --git a/ExternalReferences/Debug_Net35/NPack.dll b/ExternalReferences/Debug_Net35/NPack.dll
diff --git a/ExternalReferences/Debug_Net35/NPack.pdb b/ExternalReferences/Debug_Net35/NPack.pdb
diff --git a/ExternalReferences/Release_Net20/NPack.XML b/ExternalReferences/Release_Net20/NPack.XML
diff --git a/ExternalReferences/Release_Net20/NPack.dll b/ExternalReferences/Release_Net20/NPack.dll
diff --git a/ExternalReferences/Release_Net20/NPack.pdb b/ExternalReferences/Release_Net20/NPack.pdb
diff --git a/ExternalReferences/Release_Net35/NPack.XML b/ExternalReferences/Release_Net35/NPack.XML
diff --git a/ExternalReferences/Release_Net35/NPack.dll b/ExternalReferences/Release_Net35/NPack.dll
diff --git a/ExternalReferences/Release_Net35/NPack.pdb b/ExternalReferences/Release_Net35/NPack.pdb
diff --git a/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory`1.cs b/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystemFactory`1.cs
@@ -52,7 +52,7 @@ namespace ProjNet.CoordinateSystems
     /// </para>
     /// </remarks>
     public class CoordinateSystemFactory<TCoordinate> : ICoordinateSystemFactory<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystem`1.cs b/Proj.Net/ProjNet/CoordinateSystems/CoordinateSystem`1.cs
@@ -43,7 +43,7 @@ namespace ProjNet.CoordinateSystems
     /// mapping from the mathematical space into real-world locations is called a Datum.</para>
     /// </remarks>		
     public abstract class CoordinateSystem<TCoordinate> : Info, ICoordinateSystem<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/GeocentricCoordinateSystem`1.cs b/Proj.Net/ProjNet/CoordinateSystems/GeocentricCoordinateSystem`1.cs
@@ -31,7 +31,7 @@ namespace ProjNet.CoordinateSystems
     /// </summary>
     public class GeocentricCoordinateSystem<TCoordinate> : CoordinateSystem<TCoordinate>,
                                                            IGeocentricCoordinateSystem<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/GeographicCoordinateSystem`1.cs b/Proj.Net/ProjNet/CoordinateSystems/GeographicCoordinateSystem`1.cs
@@ -37,7 +37,7 @@ namespace ProjNet.CoordinateSystems
     /// </remarks>
     public class GeographicCoordinateSystem<TCoordinate> : HorizontalCoordinateSystem<TCoordinate>,
                                                            IGeographicCoordinateSystem<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/HorizontalCoordinateSystem`1.cs b/Proj.Net/ProjNet/CoordinateSystems/HorizontalCoordinateSystem`1.cs
@@ -29,7 +29,7 @@ namespace ProjNet.CoordinateSystems
     /// </summary>
     public abstract class HorizontalCoordinateSystem<TCoordinate> : CoordinateSystem<TCoordinate>,
                                                                     IHorizontalCoordinateSystem<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/ProjectedCoordinateSystem`1.cs b/Proj.Net/ProjNet/CoordinateSystems/ProjectedCoordinateSystem`1.cs
@@ -30,7 +30,7 @@ namespace ProjNet.CoordinateSystems
     /// </summary>
     public class ProjectedCoordinateSystem<TCoordinate> : HorizontalCoordinateSystem<TCoordinate>,
                                                           IProjectedCoordinateSystem<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Projections/AlbersProjection`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Projections/AlbersProjection`1.cs
@@ -61,7 +61,7 @@ namespace ProjNet.CoordinateSystems.Projections
     ///		direction, distance and shape somewhat.</para>
     /// </remarks>
     internal class AlbersProjection<TCoordinate> : MapProjection<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {
@@ -319,10 +319,11 @@ public override TCoordinate DegreesToMeters(TCoordinate lonlat)
         /// <returns>Transformed point in decimal degrees</returns>
         public override TCoordinate MetersToDegrees(TCoordinate p)
         {
-            Double theta = Math.Atan((p[0] * _metersPerUnit - _falseEasting)
+            Double p0 = (Double)p[0];
+            Double theta = Math.Atan((p0 * _metersPerUnit - _falseEasting)
                                      / (ro0 - (p[1].Multiply(_metersPerUnit) - _falseNorthing)));
 
-            Double ro = Math.Sqrt(Math.Pow(p[0] * _metersPerUnit - _falseEasting, 2)
+            Double ro = Math.Sqrt(Math.Pow(p0 * _metersPerUnit - _falseEasting, 2)
                                   + Math.Pow(ro0 - (p[1].Multiply(_metersPerUnit) - _falseNorthing), 2));
 
             Double q = (_c - Math.Pow(ro, 2) * Math.Pow(n, 2) / Math.Pow(SemiMajor, 2)) / n;

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Projections/LambertConformalConic`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Projections/LambertConformalConic`1.cs
@@ -56,7 +56,7 @@ namespace ProjNet.CoordinateSystems.Projections
     /// to one another in the projected domain.</para>
     /// </remarks>
     internal class LambertConformalConic2SP<TCoordinate> : MapProjection<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Projections/MapProjection`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Projections/MapProjection`1.cs
@@ -52,7 +52,7 @@ namespace ProjNet.CoordinateSystems.Projections
     /// Projections inherit from this abstract class to get access to useful mathematical functions.
     /// </summary>
     internal abstract class MapProjection<TCoordinate> : MathTransform<TCoordinate>, IProjection
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Projections/Mercator`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Projections/Mercator`1.cs
@@ -66,7 +66,7 @@ namespace ProjNet.CoordinateSystems.Projections
     /// </para>
     /// </remarks>
     internal class Mercator<TCoordinate> : MapProjection<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Projections/TransverseMercator`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Projections/TransverseMercator`1.cs
@@ -63,7 +63,7 @@ namespace ProjNet.CoordinateSystems.Projections
     ///            U.S. Geological Survey Professional Paper 1395, 1987)</para>
     /// </remarks>
     internal class TransverseMercator<TCoordinate> : MapProjection<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>, IComparable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>, IComparable<TCoordinate>,
             IComputable<Double, TCoordinate>,
             IConvertible
     {

diff --git a/Proj.Net/ProjNet/CoordinateSystems/Transformations/ConcatenatedTransform`1.cs b/Proj.Net/ProjNet/CoordinateSystems/Transformations/ConcatenatedTransform`1.cs
@@ -24,7 +24,7 @@
 namespace ProjNet.CoordinateSystems.Transformations
 {
     internal class ConcatenatedTransform<TCoordinate> : MathTransform<TCoordinate>
-        where TCoordinate : ICoordinate, IEquatable<TCoordinate>,
+        where TCoordinate : ICoordinate<TCoordinate>, IEquatable<TCoordinate>,
                             IComparable<TCoordinate>, IConvertible,
                             IComputable<Double, TCoordinate>
     {