[Trunk]

FObermaier · FObermaier · commit 258f774ef506 · 2013-03-21T20:42:55.000Z
- ensuring Map.SRID always matches Map.Factory.SRID git-tfs-id: [https://tfs.codeplex.com/tfs/TFS01]$/SharpMap/Trunk;C102205
diff --git a/SharpMap/Map/Map.cs b/SharpMap/Map/Map.cs
@@ -22,7 +22,6 @@
 using System.Globalization;
 using System.IO;
 using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
 using SharpMap.Layers;
 using SharpMap.Rendering;
 using SharpMap.Rendering.Decoration;
@@ -42,13 +41,36 @@ namespace SharpMap
     [Serializable]
     public class Map : IDisposable
     {
+        static Map()
+        {
+            if (GeoAPI.GeometryServiceProvider.Instance == null)
+                GeoAPI.GeometryServiceProvider.Instance = NetTopologySuite.NtsGeometryServices.Instance;
+        }
+
         readonly ILog _logger = LogManager.GetLogger(typeof(Map));
 
         /// <summary>
         /// Used for converting numbers to/from strings
         /// </summary>
         public static NumberFormatInfo NumberFormatEnUs = new CultureInfo("en-US", false).NumberFormat;
 
+        #region Fields
+        private readonly List<IMapDecoration> _decorations = new List<IMapDecoration>();
+
+        private Color _backgroundColor;
+        private int _srid = -1;
+        private double _zoom;
+        private Point _center;
+        private readonly LayerCollection _layers;
+        private readonly LayerCollection _backgroundLayers;
+        private readonly VariableLayerCollection _variableLayers;
+        private Matrix _mapTransform;
+        internal Matrix MapTransformInverted;
+        
+        private readonly MapViewPortGuard _mapViewportGuard;
+        #endregion
+
+
         /// <summary>
         /// Specifies whether to trigger a dispose on all layers (and their datasources) contained in this map when the map-object is disposed.
         /// The default behaviour is true unless the map is a result of a Map.Clone() operation in which case the value is false
@@ -57,17 +79,12 @@ public class Map : IDisposable
         /// </summary>
         public bool DisposeLayersOnDispose = true;
 
-        /// <summary>
-        /// Set the SRID of the Map
-        /// </summary>
-        public int SRID = -1;
-
-
         /// <summary>
         /// Initializes a new map
         /// </summary>
         public Map() : this(new Size(640, 480))
         {
+
         }
 
         /// <summary>
@@ -78,7 +95,7 @@ public Map(Size size)
         {
             _mapViewportGuard = new MapViewPortGuard(size, 0d, Double.MaxValue);
 
-            Factory = new GeometryFactory();
+            Factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(_srid);
             _layers = new LayerCollection();
             _backgroundLayers = new LayerCollection();
             _variableLayers = new VariableLayerCollection(_layers);
@@ -298,16 +315,16 @@ public Metafile GetMapAsMetafile()
         public Metafile GetMapAsMetafile(string metafileName)
         {
             Metafile metafile;
-            Bitmap bm = new Bitmap(1, 1);
-            using (Graphics g = Graphics.FromImage(bm))
+            var bm = new Bitmap(1, 1);
+            using (var g = Graphics.FromImage(bm))
             {
-                 IntPtr hdc = g.GetHdc();
-                 using (MemoryStream stream = new MemoryStream())
+                 var hdc = g.GetHdc();
+                 using (var stream = new MemoryStream())
                  {
                      metafile = new Metafile(stream, hdc, new RectangleF(0, 0, Size.Width, Size.Height),
                                              MetafileFrameUnit.Pixel, EmfType.EmfPlusDual);
 
-                     using (Graphics metafileGraphics = Graphics.FromImage(metafile))
+                     using (var metafileGraphics = Graphics.FromImage(metafile))
                      {
                          metafileGraphics.PageUnit = GraphicsUnit.Pixel;
                          metafileGraphics.TransformPoints(CoordinateSpace.Page, CoordinateSpace.Device,
@@ -801,18 +818,20 @@ public Point ImageToWorld(PointF p, bool careAboutMapTransform)
 
         #region Properties
 
-        private readonly List<IMapDecoration> _decorations = new List<IMapDecoration>();
-
-        private Color _backgroundColor;
-        private double _zoom;
-        private Point _center;
-        private readonly LayerCollection _layers;
-        private readonly LayerCollection _backgroundLayers;
-        private readonly VariableLayerCollection _variableLayers;
-        private Matrix _mapTransform;
-        internal Matrix MapTransformInverted;
-        
-        private readonly MapViewPortGuard _mapViewportGuard;
+        /// <summary>
+        /// Gets or sets the SRID of the map
+        /// </summary>
+        public int SRID
+        {
+            get { return _srid; }
+            set
+            {
+                if (_srid == value)
+                    return;
+                _srid = value;
+                Factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(_srid);
+            }
+        }
 
         /// <summary>
         /// Factory used to create geometries
@@ -1187,7 +1206,6 @@ public Int32 DisclaimerLocation
 
 
         #endregion
-
     }
 
     /// <summary>
diff --git a/UnitTests/MapTest.cs b/UnitTests/MapTest.cs
@@ -49,6 +49,15 @@ private static IProvider CreateDatasource()
             return new GeometryProvider(geoms);
         }
 
+        [Test]
+        public void MapSridEqualsFactorySrid()
+        {
+            var m = new Map();
+            Assert.AreEqual(m.SRID, m.Factory.SRID);
+            m.SRID = 10;
+            Assert.AreEqual(m.SRID, m.Factory.SRID);
+        }
+
         [Test]
         public void FindLayer_ReturnEnumerable()
         {
