From 1864162cfb293bc0abc2136e32ce08ed98729cb2 Mon Sep 17 00:00:00 2001
From: Darren Eberly <darren.eberly@gmail.com>
Date: Sun, 14 Jun 2020 14:23:06 -0400
Subject: [PATCH] fix: changes type attribute of TileSet to not be optional. It
 is provided as 'tileset' by default from Tiled.

---
 pytiled_parser/tileset.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pytiled_parser/tileset.py b/pytiled_parser/tileset.py
index 502aaa9..d2bf9a4 100644
--- a/pytiled_parser/tileset.py
+++ b/pytiled_parser/tileset.py
@@ -139,6 +139,7 @@ class TileSet:
     """
 
     name: str
+    type: str
     tile_width: int
     tile_height: int
 
@@ -155,7 +156,6 @@ class TileSet:
     image_width: Optional[int] = None
     image_height: Optional[int] = None
 
-    type: Optional[str] = None
     firstgid: Optional[int] = None
     background_color: Optional[Color] = None
     tile_offset: Optional[OrderedPair] = None
@@ -372,6 +372,7 @@ def cast(raw_tileset: RawTileSet) -> TileSet:
         margin=raw_tileset["margin"],
         version=raw_tileset["version"],
         tiled_version=raw_tileset["tiledversion"],
+        type=raw_tileset["type"],
     )
 
     if raw_tileset.get("image") is not None:
@@ -395,9 +396,6 @@ def cast(raw_tileset: RawTileSet) -> TileSet:
     if raw_tileset.get("transparentcolor") is not None:
         tileset.transparent_color = raw_tileset["transparentcolor"]
 
-    if raw_tileset.get("type") is not None:
-        tileset.type = raw_tileset["type"]
-
     if raw_tileset.get("grid") is not None:
         tileset.grid = _cast_grid(raw_tileset["grid"])