Merge pull request #33 from ShawnCowles/master

Load maps from streams and xdocuments.

Author: marshallward

TiledSharp/src/Map.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Xml.Linq;
 using System.Globalization;
+using System.IO;
 
 namespace TiledSharp
 {
@@ -31,9 +32,22 @@ public class TmxMap : TmxDocument
 
         public TmxMap(string filename)
         {
-            XDocument xDoc = ReadXml(filename);
-            var xMap = xDoc.Element("map");
+            Load(ReadXml(filename));
+        }
+
+        public TmxMap(Stream inputStream)
+        {
+            Load(XDocument.Load(inputStream));
+        }
 
+        public TmxMap(XDocument xDoc)
+        {
+            Load(xDoc);
+        }
+         
+        private void Load(XDocument xDoc)
+        {
+            var xMap = xDoc.Element("map");
             Version = (string) xMap.Attribute("version");
 
             Width = (int) xMap.Attribute("width");

TiledSharp/src/TiledCore.cs

@@ -18,6 +18,11 @@ public class TmxDocument
     {
         public string TmxDirectory {get; private set;}
 
+        public TmxDocument()
+        {
+            TmxDirectory = string.Empty;
+        }
+
         protected XDocument ReadXml(string filepath)
         {
             XDocument xDoc;