[Trunk]

FObermaier · FObermaier · commit 62576595e2d4 · 2012-05-09T15:32:53.000Z
- Changed Layer.Style to accept IStyle - Made IStyle implement IDisposable - Applied diegos patch #12145 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS01]$/SharpMap/Trunk;C97690
diff --git a/SharpMap/Data/Providers/ShapeFile.cs b/SharpMap/Data/Providers/ShapeFile.cs
@@ -191,6 +191,8 @@ public class ShapeFile : FilterProvider, IProvider
 	    protected DbaseReader DbaseFile;
 		private Stream _fsShapeFile;
 
+        private static readonly object GspLock = new object();
+
 #if USE_MEMORYMAPPED_FILE
         private static Dictionary<string,System.IO.MemoryMappedFiles.MemoryMappedFile> _memMappedFiles;
         private static Dictionary<string, int> _memMappedFilesRefConter;
@@ -788,7 +790,8 @@ public virtual int SRID
 			set
 			{
 			    _srid = value;
-			    Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(value);
+			    lock (GspLock)
+			        Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(value);
 			}
 		}
 
diff --git a/SharpMap/Layers/Layer.cs b/SharpMap/Layers/Layer.cs
@@ -87,12 +87,11 @@ protected virtual void OnLayerNameChanged(EventArgs eventArgs)
 
         #endregion
 
-
         private ICoordinateTransformation _coordinateTransform;
         private ICoordinateTransformation _reverseCoordinateTransform;
 
         private string _layerName;
-        private Style _style;
+        private IStyle _style;
         private int _srid = -1;
         private int? _targetSrid;
 
@@ -264,9 +263,9 @@ public bool Enabled
         }
 
         /// <summary>
-        /// Gets/sets the Style for this Layer
+        /// Gets or sets the Style for this Layer
         /// </summary>
-        public virtual Style Style
+        public virtual IStyle Style
         {
             get { return _style; }
             set
diff --git a/SharpMap/Styles/IStyle.cs b/SharpMap/Styles/IStyle.cs
@@ -15,12 +15,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using System;
+
 namespace SharpMap.Styles
 {
     /// <summary>
     /// Defines an interface for defining layer styles
     /// </summary>
-    public interface IStyle
+    public interface IStyle : IDisposable
     {
         /// <summary>
         /// Gets or sets the minimum zoom value where the style is applied
diff --git a/SharpMap/Styles/Style.cs b/SharpMap/Styles/Style.cs
@@ -70,5 +70,36 @@ public bool Enabled
         }
 
         #endregion
+
+        //#region Equals
+        //public override bool Equals(object obj)
+        //{
+        //    if (ReferenceEquals(this, obj))
+        //        return true;
+
+        //    var styleObj = obj as Style;
+        //    if (styleObj == null)
+        //        return false;
+
+        //    if (_visible != styleObj._visible)
+        //        return false;
+
+        //    if (Math.Abs(_minVisible - styleObj._minVisible) < 1e9)
+        //        return false;
+        //    if (Math.Abs(_maxVisible - styleObj._maxVisible) < 1e9)
+        //        return false;
+
+        //    return true;
+        //}
+
+        //public override int GetHashCode()
+        //{
+        //    unchecked
+        //    {
+        //        var result = _visible.GetHashCode();
+        //        return (result * 397) ^ (_maxVisible - _minVisible).GetHashCode();
+        //    }
+        //}
+        //#endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,8 @@ public class ShapeFile : FilterProvider, IProvider`
`191`	`191`	`protected DbaseReader DbaseFile;`
`192`	`192`	`private Stream _fsShapeFile;`
`193`	`193`
	`194`	`+ private static readonly object GspLock = new object();`
	`195`	`+`
`194`	`196`	`#if USE_MEMORYMAPPED_FILE`
`195`	`197`	`private static Dictionary<string,System.IO.MemoryMappedFiles.MemoryMappedFile> _memMappedFiles;`
`196`	`198`	`private static Dictionary<string, int> _memMappedFilesRefConter;`
`@@ -788,7 +790,8 @@ public virtual int SRID`
`788`	`790`	`set`
`789`	`791`	`{`
`790`	`792`	`_srid = value;`
`791`		`- Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(value);`
	`793`	`+ lock (GspLock)`
	`794`	`+ Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(value);`
`792`	`795`	`}`
`793`	`796`	`}`
`794`	`797`