Tiled 1.9 Compatibility Update

2026-01-16 15:56:09 +01:00 · 2022-08-02 20:28:19 -04:00
parent ddf314e4f0
commit 54ad83245f
107 changed files with 549 additions and 425 deletions
--- a/tests/test_data/layer_tests/all_layer_types/expected.py
+++ b/tests/test_data/layer_tests/all_layer_types/expected.py
@@ -100,7 +100,7 @@ EXPECTED = [
                        size=common_types.Size(69.3333333333333, 52.6666666666667),
                        coordinates=common_types.OrderedPair(46.3333333333333, 39),
                        visible=True,
-                        type="",
+                        class_="",
                    )
                ],
            ),
--- a/tests/test_data/layer_tests/all_layer_types/map.json
+++ b/tests/test_data/layer_tests/all_layer_types/map.json
@@ -3,7 +3,12 @@
 "infinite":false,
 "layers":[
        {
-         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48],
+         "data":[1, 2, 3, 4, 5, 6, 7, 8,
+            9, 10, 11, 12, 13, 14, 15, 16,
+            17, 18, 19, 20, 21, 22, 23, 24,
+            25, 26, 27, 28, 29, 30, 31, 32,
+            33, 34, 35, 36, 37, 38, 39, 40,
+            41, 42, 43, 44, 45, 46, 47, 48],
         "height":6,
         "id":1,
         "name":"Tile Layer 1",
@@ -34,11 +39,11 @@
                 "name":"Object Layer 1",
                 "objects":[
                        {
+                         "class":"",
                         "height":52.6666666666667,
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
@@ -88,7 +93,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.7.2",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -97,6 +102,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/all_layer_types/map.tmx
+++ b/tests/test_data/layer_tests/all_layer_types/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="3">
 <tileset firstgid="1" source="tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="8" height="6" tintcolor="#aaffff" offsetx="1" offsety="3" parallaxx="1.4" parallaxy="1.3">
  <properties>
--- a/tests/test_data/layer_tests/all_layer_types/tileset.json
+++ b/tests/test_data/layer_tests/all_layer_types/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/layer_tests/all_layer_types/tileset.tsx
+++ b/tests/test_data/layer_tests/all_layer_types/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/layer_tests/b64/expected.py
+++ b/tests/test_data/layer_tests/b64/expected.py
@@ -92,7 +92,7 @@ EXPECTED = [
                        size=common_types.Size(69.3333333333333, 52.6666666666667),
                        coordinates=common_types.OrderedPair(46.3333333333333, 39),
                        visible=True,
-                        type="",
+                        class_="",
                    )
                ],
            ),
--- a/tests/test_data/layer_tests/b64/map.json
+++ b/tests/test_data/layer_tests/b64/map.json
@@ -25,11 +25,11 @@
                 "name":"Object Layer 1",
                 "objects":[
                        {
+                         "class":"",
                         "height":52.6666666666667,
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
@@ -63,7 +63,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -72,6 +72,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/b64/map.tmx
+++ b/tests/test_data/layer_tests/b64/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
 <tileset firstgid="1" source="../all_layer_types/tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="8" height="6">
  <data encoding="base64">
--- a/tests/test_data/layer_tests/b64/tileset.json
+++ b/tests/test_data/layer_tests/b64/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/layer_tests/b64/tileset.tsx
+++ b/tests/test_data/layer_tests/b64/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/layer_tests/b64_gzip/expected.py
+++ b/tests/test_data/layer_tests/b64_gzip/expected.py
@@ -92,7 +92,7 @@ EXPECTED = [
                        size=common_types.Size(69.3333333333333, 52.6666666666667),
                        coordinates=common_types.OrderedPair(46.3333333333333, 39),
                        visible=True,
-                        type="",
+                        class_="",
                    )
                ],
            ),
--- a/tests/test_data/layer_tests/b64_gzip/map.json
+++ b/tests/test_data/layer_tests/b64_gzip/map.json
@@ -25,11 +25,11 @@
                 "name":"Object Layer 1",
                 "objects":[
                        {
+                         "class":"",
                         "height":52.6666666666667,
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
@@ -63,7 +63,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -72,6 +72,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/b64_gzip/map.tmx
+++ b/tests/test_data/layer_tests/b64_gzip/map.tmx
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
 <tileset firstgid="1" source="../all_layer_types/tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="8" height="6">
  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAACg3DBRKCQAAAwDMRA7BQLMTE9v+vY3dmWyGEth279uwbOTB26MixExNTM6fOnLtwae7KtYUbt+7ce7D0aOXJsxev3rxb+/Dpy7cfv/782wAcvDirwAAAAA==
+   H4sIAAAAAAAAAw3DBRKCQAAAwDMRA7BQLMTE9v+vY3dmWyGEth279uwbOTB26MixExNTM6fOnLtwae7KtYUbt+7ce7D0aOXJsxev3rxb+/Dpy7cfv/782wAcvDirwAAAAA==
  </data>
 </layer>
 <group id="4" name="Group 1">
--- a/tests/test_data/layer_tests/b64_gzip/tileset.json
+++ b/tests/test_data/layer_tests/b64_gzip/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/layer_tests/b64_gzip/tileset.tsx
+++ b/tests/test_data/layer_tests/b64_gzip/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/layer_tests/b64_zlib/expected.py
+++ b/tests/test_data/layer_tests/b64_zlib/expected.py
@@ -92,7 +92,7 @@ EXPECTED = [
                        size=common_types.Size(69.3333333333333, 52.6666666666667),
                        coordinates=common_types.OrderedPair(46.3333333333333, 39),
                        visible=True,
-                        type="",
+                        class_="",
                    )
                ],
            ),
--- a/tests/test_data/layer_tests/b64_zlib/map.json
+++ b/tests/test_data/layer_tests/b64_zlib/map.json
@@ -25,11 +25,11 @@
                 "name":"Object Layer 1",
                 "objects":[
                        {
+                         "class":"",
                         "height":52.6666666666667,
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
@@ -63,7 +63,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -72,6 +72,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/b64_zlib/map.tmx
+++ b/tests/test_data/layer_tests/b64_zlib/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
 <tileset firstgid="1" source="../all_layer_types/tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="8" height="6">
  <data encoding="base64" compression="zlib">
--- a/tests/test_data/layer_tests/b64_zlib/tileset.json
+++ b/tests/test_data/layer_tests/b64_zlib/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/layer_tests/b64_zlib/tileset.tsx
+++ b/tests/test_data/layer_tests/b64_zlib/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/layer_tests/b64_zstd/map.json
+++ b/tests/test_data/layer_tests/b64_zstd/map.json
@@ -25,11 +25,11 @@
                 "name":"Object Layer 1",
                 "objects":[
                        {
+                         "class":"",
                         "height":52.6666666666667,
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
@@ -63,7 +63,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -72,6 +72,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.8",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/b64_zstd/map.tmx
+++ b/tests/test_data/layer_tests/b64_zstd/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="3">
 <tileset firstgid="1" source="../all_layer_types/tileset.json"/>
 <layer id="1" name="Tile Layer 1" width="8" height="6">
  <data encoding="base64" compression="zstd">
--- a/tests/test_data/layer_tests/b64_zstd/tileset.json
+++ b/tests/test_data/layer_tests/b64_zstd/tileset.json
@@ -6,7 +6,7 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
--- a/tests/test_data/layer_tests/infinite_map/map.json
+++ b/tests/test_data/layer_tests/infinite_map/map.json
@@ -17,14 +17,28 @@
        {
         "chunks":[
                {
-                 "data":[1, 2, 3, 4, 9, 10, 11, 12, 17, 18, 19, 20, 25, 26, 27, 28, 33, 34, 35, 36, 41, 42, 43, 44, 0, 0, 0, 0, 0, 0, 0, 0],
+                 "data":[1, 2, 3, 4,
+                    9, 10, 11, 12,
+                    17, 18, 19, 20,
+                    25, 26, 27, 28,
+                    33, 34, 35, 36,
+                    41, 42, 43, 44,
+                    0, 0, 0, 0,
+                    0, 0, 0, 0],
                 "height":8,
                 "width":4,
                 "x":0,
                 "y":0
                }, 
                {
-                 "data":[5, 6, 7, 8, 13, 14, 15, 16, 21, 22, 23, 24, 29, 30, 31, 32, 37, 38, 39, 40, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0],
+                 "data":[5, 6, 7, 8,
+                    13, 14, 15, 16,
+                    21, 22, 23, 24,
+                    29, 30, 31, 32,
+                    37, 38, 39, 40,
+                    45, 46, 47, 48,
+                    0, 0, 0, 0,
+                    0, 0, 0, 0],
                 "height":8,
                 "width":4,
                 "x":4,
@@ -54,7 +68,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -63,6 +77,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/infinite_map/map.tmx
+++ b/tests/test_data/layer_tests/infinite_map/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="1" nextlayerid="6" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="1" nextlayerid="6" nextobjectid="3">
 <editorsettings>
  <chunksize width="4" height="8"/>
  <export target="../tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/tests/test_data/layer_tests/all_layer_types"/>
--- a/tests/test_data/layer_tests/infinite_map_b64/map.json
+++ b/tests/test_data/layer_tests/infinite_map_b64/map.json
@@ -37,7 +37,7 @@
 "nextobjectid":3,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -46,6 +46,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/infinite_map_b64/map.tmx
+++ b/tests/test_data/layer_tests/infinite_map_b64/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="1" nextlayerid="6" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="1" nextlayerid="6" nextobjectid="3">
 <tileset firstgid="1" source="../all_layer_types/tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="16" height="16" offsetx="1" offsety="3">
  <properties>
--- a/tests/test_data/layer_tests/no_layers/map.json
+++ b/tests/test_data/layer_tests/no_layers/map.json
@@ -42,7 +42,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -51,6 +51,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/layer_tests/no_layers/map.tmx
+++ b/tests/test_data/layer_tests/no_layers/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
 <properties>
  <property name="bool property - false" type="bool" value="false"/>
  <property name="bool property - true" type="bool" value="true"/>
--- a/tests/test_data/layer_tests/no_layers/tileset.json
+++ b/tests/test_data/layer_tests/no_layers/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/layer_tests/no_layers/tileset.tsx
+++ b/tests/test_data/layer_tests/no_layers/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/layer_tests/unknown_type/map.json
+++ b/tests/test_data/layer_tests/unknown_type/map.json
@@ -29,7 +29,7 @@
                         "id":1,
                         "name":"",
                         "rotation":0,
-                         "type":"",
+                         "class":"",
                         "visible":true,
                         "width":69.3333333333333,
                         "x":46.3333333333333,
--- a/tests/test_data/map_tests/cross_format_tileset/map.json
+++ b/tests/test_data/map_tests/cross_format_tileset/map.json
@@ -38,7 +38,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -47,6 +47,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/cross_format_tileset/map.tmx
+++ b/tests/test_data/map_tests/cross_format_tileset/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="2" nextobjectid="1">
 <properties>
  <property name="bool property - true" type="bool" value="true"/>
  <property name="color property" type="color" value="#ff49fcff"/>
--- a/tests/test_data/map_tests/cross_format_tileset/tileset.json
+++ b/tests/test_data/map_tests/cross_format_tileset/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/cross_format_tileset/tileset.tsx
+++ b/tests/test_data/map_tests/cross_format_tileset/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.6" tiledversion="1.6.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/map_tests/embedded_tileset/map.json
+++ b/tests/test_data/map_tests/embedded_tileset/map.json
@@ -6,7 +6,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -24,6 +24,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/embedded_tileset/map.tmx
+++ b/tests/test_data/map_tests/embedded_tileset/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
 <tileset firstgid="1" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
  <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
@@ -104,7 +104,7 @@ EXPECTED = tiled_map.TiledMap(
                    image_height=32,
                    image_width=32,
                    properties={"float property": 2.2},
-                    type="tile",
+                    class_="tile",
                ),
                1: tileset.Tile(
                    id=1,
@@ -126,7 +126,7 @@ EXPECTED = tiled_map.TiledMap(
                                    14.4766410408043, 13.7196924896511
                                ),
                                rotation=0,
-                                type="",
+                                class_="",
                                visible=True,
                                coordinates=common_types.OrderedPair(
                                    13.4358367829687, 13.5304553518628
@@ -139,7 +139,7 @@ EXPECTED = tiled_map.TiledMap(
                                    14.287403903016, 11.070372560615
                                ),
                                rotation=0,
-                                type="",
+                                class_="",
                                visible=True,
                                coordinates=common_types.OrderedPair(
                                    13.8143110585452, 1.98698994677705
@@ -148,7 +148,7 @@ EXPECTED = tiled_map.TiledMap(
                        ],
                    ),
                    properties={"string property": "testing"},
-                    type="tile",
+                    class_="tile",
                ),
                2: tileset.Tile(
                    id=2,
@@ -158,7 +158,7 @@ EXPECTED = tiled_map.TiledMap(
                    image_height=32,
                    image_width=32,
                    properties={"bool property": True},
-                    type="tile",
+                    class_="tile",
                ),
                3: tileset.Tile(
                    id=3,
@@ -167,7 +167,7 @@ EXPECTED = tiled_map.TiledMap(
                    .resolve(),
                    image_height=32,
                    image_width=32,
-                    type="tile",
+                    class_="tile",
                ),
            },
        )
--- a/tests/test_data/map_tests/external_tileset_dif_dir/map.json
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.json
@@ -52,7 +52,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -61,6 +61,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="3" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="3" nextobjectid="1">
 <properties>
  <property name="bool property - true" type="bool" value="true"/>
  <property name="color property" type="color" value="#ff49fcff"/>
--- a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json
@@ -9,7 +9,7 @@
 "name":"tileset",
 "spacing":0,
 "tilecount":4,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tiles":[
        {
@@ -30,6 +30,7 @@
                 "duration":100,
                 "tileid":3
                }],
+         "class":"tile",
         "id":0,
         "image":"..\/..\/..\/images\/tile_01.png",
         "imageheight":32,
@@ -39,10 +40,10 @@
                 "name":"float property",
                 "type":"float",
                 "value":2.2
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":1,
         "image":"..\/..\/..\/images\/tile_02.png",
         "imageheight":32,
@@ -53,23 +54,23 @@
             "name":"",
             "objects":[
                    {
+                     "class":"",
                     "height":13.7196924896511,
                     "id":2,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.4766410408043,
                     "x":13.4358367829687,
                     "y":13.5304553518628
                    }, 
                    {
+                     "class":"",
                     "ellipse":true,
                     "height":11.070372560615,
                     "id":3,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.287403903016,
                     "x":13.8143110585452,
@@ -86,10 +87,10 @@
                 "name":"string property",
                 "type":"string",
                 "value":"testing"
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":2,
         "image":"..\/..\/..\/images\/tile_03.png",
         "imageheight":32,
@@ -99,17 +100,16 @@
                 "name":"bool property",
                 "type":"bool",
                 "value":true
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":3,
         "image":"..\/..\/..\/images\/tile_04.png",
         "imageheight":32,
-         "imagewidth":32,
-         "type":"tile"
+         "imagewidth":32
        }],
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx
+++ b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
 <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0" type="tile">
+ <tile id="0" class="tile">
  <properties>
   <property name="float property" type="float" value="2.2"/>
  </properties>
@@ -13,7 +13,7 @@
   <frame tileid="3" duration="100"/>
  </animation>
 </tile>
- <tile id="1" type="tile">
+ <tile id="1" class="tile">
  <properties>
   <property name="string property" value="testing"/>
  </properties>
@@ -25,13 +25,13 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="2" type="tile">
+ <tile id="2" class="tile">
  <properties>
   <property name="bool property" type="bool" value="true"/>
  </properties>
  <image width="32" height="32" source="../../../images/tile_03.png"/>
 </tile>
- <tile id="3" type="tile">
+ <tile id="3" class="tile">
  <image width="32" height="32" source="../../../images/tile_04.png"/>
 </tile>
 </tileset>
--- a/tests/test_data/map_tests/hexagonal/map.json
+++ b/tests/test_data/map_tests/hexagonal/map.json
@@ -4,7 +4,16 @@
 "infinite":false,
 "layers":[
        {
-         "data":[3, 3, 3, 3, 9, 9, 9, 9, 17, 17, 3, 3, 3, 9, 9, 9, 9, 17, 17, 17, 3, 3, 3, 9, 9, 9, 9, 9, 17, 17, 3, 3, 1, 7, 9, 9, 9, 15, 17, 17, 1, 1, 12, 5, 7, 7, 7, 15, 15, 15, 12, 1, 5, 5, 7, 7, 7, 15, 15, 15, 2, 2, 5, 5, 5, 5, 4, 14, 14, 14, 2, 2, 5, 5, 5, 4, 14, 14, 14, 14, 2, 2, 2, 5, 5, 5, 4, 14, 14, 14, 2, 2, 2, 2, 5, 5, 4, 4, 14, 14],
+         "data":[3, 3, 3, 3, 9, 9, 9, 9, 17, 17,
+            3, 3, 3, 9, 9, 9, 9, 17, 17, 17,
+            3, 3, 3, 9, 9, 9, 9, 9, 17, 17,
+            3, 3, 1, 7, 9, 9, 9, 15, 17, 17,
+            1, 1, 12, 5, 7, 7, 7, 15, 15, 15,
+            12, 1, 5, 5, 7, 7, 7, 15, 15, 15,
+            2, 2, 5, 5, 5, 5, 4, 14, 14, 14,
+            2, 2, 5, 5, 5, 4, 14, 14, 14, 14,
+            2, 2, 2, 5, 5, 5, 4, 14, 14, 14,
+            2, 2, 2, 2, 5, 5, 4, 4, 14, 14],
         "height":10,
         "id":1,
         "name":"Tile Layer 1",
@@ -21,7 +30,7 @@
 "renderorder":"right-down",
 "staggeraxis":"y",
 "staggerindex":"odd",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":12,
 "tilesets":[
        {
@@ -30,6 +39,6 @@
        }],
 "tilewidth":14,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":10
 }
--- a/tests/test_data/map_tests/hexagonal/map.tmx
+++ b/tests/test_data/map_tests/hexagonal/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="hexagonal" renderorder="right-down" width="10" height="10" tilewidth="14" tileheight="12" infinite="0" hexsidelength="6" staggeraxis="y" staggerindex="odd" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="hexagonal" renderorder="right-down" width="10" height="10" tilewidth="14" tileheight="12" infinite="0" hexsidelength="6" staggeraxis="y" staggerindex="odd" nextlayerid="2" nextobjectid="1">
 <tileset firstgid="1" source="tileset.tsx"/>
 <layer id="1" name="Tile Layer 1" width="10" height="10">
  <data encoding="csv">
--- a/tests/test_data/map_tests/hexagonal/tileset.json
+++ b/tests/test_data/map_tests/hexagonal/tileset.json
@@ -6,7 +6,7 @@
 "name":"tileset",
 "spacing":0,
 "tilecount":20,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":18,
 "tileoffset":
    {
@@ -15,5 +15,5 @@
    },
 "tilewidth":18,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/hexagonal/tileset.tsx
+++ b/tests/test_data/map_tests/hexagonal/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="18" tileheight="18" tilecount="20" columns="5">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="18" tileheight="18" tilecount="20" columns="5">
 <tileoffset x="0" y="1"/>
 <image source="../../images/hexmini.png" width="106" height="72"/>
 </tileset>
--- a/tests/test_data/map_tests/json_invalid_tileset/map.json
+++ b/tests/test_data/map_tests/json_invalid_tileset/map.json
@@ -38,7 +38,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -47,6 +47,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/no_background_color/map.json
+++ b/tests/test_data/map_tests/no_background_color/map.json
@@ -6,7 +6,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -15,6 +15,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/no_background_color/map.tmx
+++ b/tests/test_data/map_tests/no_background_color/map.tmx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.6" tiledversion="1.6.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="2" nextobjectid="1">
 <tileset firstgid="1" source="tileset.tsx"/>
 </map>
--- a/tests/test_data/map_tests/no_background_color/tileset.json
+++ b/tests/test_data/map_tests/no_background_color/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/no_background_color/tileset.tsx
+++ b/tests/test_data/map_tests/no_background_color/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.6" tiledversion="1.6.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/map_tests/no_layers/map.json
+++ b/tests/test_data/map_tests/no_layers/map.json
@@ -38,7 +38,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -47,6 +47,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/no_layers/tileset.json
+++ b/tests/test_data/map_tests/no_layers/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/template/expected.py
+++ b/tests/test_data/map_tests/template/expected.py
@@ -21,14 +21,14 @@ EXPECTED = tiled_map.TiledMap(
                        98.4987608686521, 46.2385012811358
                    ),
                    visible=True,
-                    type="",
+                    class_="",
                ),
                tiled_object.Tile(
                    id=6,
                    coordinates=common_types.OrderedPair(46, 136.666666666667),
                    name="",
                    rotation=0,
-                    type="",
+                    class_="",
                    visible=True,
                    size=common_types.Size(32, 32),
                    gid=49,
@@ -38,7 +38,7 @@ EXPECTED = tiled_map.TiledMap(
                    coordinates=common_types.OrderedPair(141.333333333333, 148),
                    name="",
                    rotation=0,
-                    type="",
+                    class_="",
                    visible=True,
                    size=common_types.Size(32, 32),
                    gid=50,
--- a/tests/test_data/map_tests/template/map.json
+++ b/tests/test_data/map_tests/template/map.json
@@ -67,7 +67,7 @@
         "value":"Hello, World!!"
        }],
 "renderorder":"right-down",
- "tiledversion":"1.7.1",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -80,6 +80,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":8
 }
--- a/tests/test_data/map_tests/template/map.tmx
+++ b/tests/test_data/map_tests/template/map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="3" nextobjectid="8">
+<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#ff0004" nextlayerid="3" nextobjectid="8">
 <properties>
  <property name="bool property - true" type="bool" value="true"/>
  <property name="color property" type="color" value="#ff49fcff"/>
--- a/tests/test_data/map_tests/template/template-rectangle.json
+++ b/tests/test_data/map_tests/template/template-rectangle.json
@@ -4,7 +4,7 @@
     "id":1,
     "name":"",
     "rotation":0,
-     "type":"",
+     "class":"",
     "visible":true,
     "width":63.6585878103079
    },
--- a/tests/test_data/map_tests/template/template-tile-image.json
+++ b/tests/test_data/map_tests/template/template-tile-image.json
@@ -5,7 +5,7 @@
     "id":7,
     "name":"",
     "rotation":0,
-     "type":"",
+     "class":"",
     "visible":true,
     "width":32
    },
--- a/tests/test_data/map_tests/template/template-tile-spritesheet.json
+++ b/tests/test_data/map_tests/template/template-tile-spritesheet.json
@@ -5,7 +5,7 @@
     "id":6,
     "name":"",
     "rotation":0,
-     "type":"",
+     "class":"",
     "visible":true,
     "width":32
    },
--- a/tests/test_data/map_tests/template/tileset.json
+++ b/tests/test_data/map_tests/template/tileset.json
@@ -6,9 +6,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/map_tests/template/tileset.tsx
+++ b/tests/test_data/map_tests/template/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image/tileset.json
+++ b/tests/test_data/tilesets/image/tileset.json
@@ -7,7 +7,7 @@
 "objectalignment":"topleft",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
--- a/tests/test_data/tilesets/image/tileset.tsx
+++ b/tests/test_data/tilesets/image/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.5" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" objectalignment="topleft">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" objectalignment="topleft">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_background_color/tileset.json
+++ b/tests/test_data/tilesets/image_background_color/tileset.json
@@ -7,9 +7,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_background_color/tileset.tsx
+++ b/tests/test_data/tilesets/image_background_color/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" backgroundcolor="#5500ff">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" backgroundcolor="#5500ff">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_grid/tileset.json
+++ b/tests/test_data/tilesets/image_grid/tileset.json
@@ -20,9 +20,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_grid/tileset.tsx
+++ b/tests/test_data/tilesets/image_grid/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_properties/tileset.json
+++ b/tests/test_data/tilesets/image_properties/tileset.json
@@ -40,9 +40,9 @@
        }],
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_properties/tileset.tsx
+++ b/tests/test_data/tilesets/image_properties/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_tile_offset/tileset.json
+++ b/tests/test_data/tilesets/image_tile_offset/tileset.json
@@ -14,7 +14,7 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tileoffset":
    {
@@ -23,5 +23,5 @@
    },
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_tile_offset/tileset.tsx
+++ b/tests/test_data/tilesets/image_tile_offset/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_transformations/tileset.json
+++ b/tests/test_data/tilesets/image_transformations/tileset.json
@@ -6,7 +6,7 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "transformations":
@@ -17,5 +17,5 @@
     "vflip":false
    },
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_transformations/tileset.tsx
+++ b/tests/test_data/tilesets/image_transformations/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <transformations hflip="1" vflip="0" rotate="0" preferuntransformed="0"/>
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_transparent_color/tileset.json
+++ b/tests/test_data/tilesets/image_transparent_color/tileset.json
@@ -6,10 +6,10 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "transparentcolor":"#ff00ff",
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_transparent_color/tileset.tsx
+++ b/tests/test_data/tilesets/image_transparent_color/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" trans="ff00ff" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/individual_images/expected.py
+++ b/tests/test_data/tilesets/individual_images/expected.py
@@ -28,7 +28,7 @@ EXPECTED = tileset.Tileset(
            image_height=32,
            image_width=32,
            properties={"float property": 2.2},
-            type="tile",
+            class_="tile",
        ),
        1: tileset.Tile(
            id=1,
@@ -46,7 +46,7 @@ EXPECTED = tileset.Tileset(
                        name="",
                        size=common_types.Size(14.4766410408043, 13.7196924896511),
                        rotation=0,
-                        type="",
+                        class_="",
                        visible=True,
                        coordinates=common_types.OrderedPair(
                            13.4358367829687, 13.5304553518628
@@ -57,7 +57,7 @@ EXPECTED = tileset.Tileset(
                        name="",
                        size=common_types.Size(14.287403903016, 11.070372560615),
                        rotation=0,
-                        type="",
+                        class_="",
                        visible=True,
                        coordinates=common_types.OrderedPair(
                            13.8143110585452, 1.98698994677705
@@ -66,7 +66,7 @@ EXPECTED = tileset.Tileset(
                ],
            ),
            properties={"string property": "testing"},
-            type="tile",
+            class_="tile",
        ),
        2: tileset.Tile(
            id=2,
@@ -74,14 +74,14 @@ EXPECTED = tileset.Tileset(
            image_height=32,
            image_width=32,
            properties={"bool property": True},
-            type="tile",
+            class_="tile",
        ),
        3: tileset.Tile(
            id=3,
            image=Path("../../images/tile_04.png"),
            image_height=32,
            image_width=32,
-            type="tile",
+            class_="tile",
        ),
    },
 )
--- a/tests/test_data/tilesets/individual_images/tileset.json
+++ b/tests/test_data/tilesets/individual_images/tileset.json
@@ -9,7 +9,7 @@
 "name":"tileset",
 "spacing":0,
 "tilecount":4,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tiles":[
        {
@@ -30,6 +30,7 @@
                 "duration":100,
                 "tileid":3
                }],
+         "class":"tile",
         "id":0,
         "image":"..\/..\/images\/tile_01.png",
         "imageheight":32,
@@ -39,10 +40,10 @@
                 "name":"float property",
                 "type":"float",
                 "value":2.2
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":1,
         "image":"..\/..\/images\/tile_02.png",
         "imageheight":32,
@@ -53,23 +54,23 @@
             "name":"",
             "objects":[
                    {
+                     "class":"",
                     "height":13.7196924896511,
                     "id":2,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.4766410408043,
                     "x":13.4358367829687,
                     "y":13.5304553518628
                    }, 
                    {
+                     "class":"",
                     "ellipse":true,
                     "height":11.070372560615,
                     "id":3,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.287403903016,
                     "x":13.8143110585452,
@@ -86,10 +87,10 @@
                 "name":"string property",
                 "type":"string",
                 "value":"testing"
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":2,
         "image":"..\/..\/images\/tile_03.png",
         "imageheight":32,
@@ -99,17 +100,16 @@
                 "name":"bool property",
                 "type":"bool",
                 "value":true
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":3,
         "image":"..\/..\/images\/tile_04.png",
         "imageheight":32,
-         "imagewidth":32,
-         "type":"tile"
+         "imagewidth":32
        }],
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/individual_images/tileset.tsx
+++ b/tests/test_data/tilesets/individual_images/tileset.tsx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
 <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0" type="tile">
+ <tile id="0" class="tile">
  <properties>
   <property name="float property" type="float" value="2.2"/>
  </properties>
@@ -13,7 +13,7 @@
   <frame tileid="3" duration="100"/>
  </animation>
 </tile>
- <tile id="1" type="tile">
+ <tile id="1" class="tile">
  <properties>
   <property name="string property" value="testing"/>
  </properties>
@@ -25,13 +25,13 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="2" type="tile">
+ <tile id="2" class="tile">
  <properties>
   <property name="bool property" type="bool" value="true"/>
  </properties>
  <image width="32" height="32" source="../../images/tile_03.png"/>
 </tile>
- <tile id="3" type="tile">
+ <tile id="3" class="tile">
  <image width="32" height="32" source="../../images/tile_04.png"/>
 </tile>
 </tileset>
--- a/tests/test_data/tilesets/terrain/tileset.json
+++ b/tests/test_data/tilesets/terrain/tileset.json
@@ -6,7 +6,7 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
--- a/tests/test_data/tilesets/terrain/tileset.tsx
+++ b/tests/test_data/tilesets/terrain/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.5" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 <wangsets>
  <wangset name="Terrains" type="mixed" tile="-1">
--- a/tests/test_data/world_tests/both/map_manual_one.json
+++ b/tests/test_data/world_tests/both/map_manual_one.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/both/map_p0-n0.json
+++ b/tests/test_data/world_tests/both/map_p0-n0.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/both/map_p0-n1.json
+++ b/tests/test_data/world_tests/both/map_p0-n1.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/both/tileset.json
+++ b/tests/test_data/world_tests/both/tileset.json
@@ -6,9 +6,9 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/world_tests/pattern_matched/map_p0-n0.json
+++ b/tests/test_data/world_tests/pattern_matched/map_p0-n0.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/pattern_matched/tileset.json
+++ b/tests/test_data/world_tests/pattern_matched/tileset.json
@@ -6,9 +6,9 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/world_tests/static_defined/map_01.json
+++ b/tests/test_data/world_tests/static_defined/map_01.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/static_defined/map_02.json
+++ b/tests/test_data/world_tests/static_defined/map_02.json
@@ -3,7 +3,11 @@
 "infinite":false,
 "layers":[
        {
-         "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30],
+         "data":[30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30,
+            30, 30, 30, 30, 30],
         "height":5,
         "id":1,
         "name":"Tile Layer 1",
@@ -18,7 +22,7 @@
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilesets":[
        {
@@ -27,6 +31,6 @@
        }],
 "tilewidth":32,
 "type":"map",
- "version":"1.6",
+ "version":"1.9",
 "width":5
 }
--- a/tests/test_data/world_tests/static_defined/tileset.json
+++ b/tests/test_data/world_tests/static_defined/tileset.json
@@ -6,9 +6,9 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_tiled_object_json.py
+++ b/tests/test_tiled_object_json.py
@@ -38,7 +38,7 @@ ELLIPSES = [
            size=common_types.Size(57.4013868364215, 18.5517790155735),
            name="name: ellipse",
            rotation=0,
-            type="ellipse",
+            class_="ellipse",
            visible=True,
            coordinates=common_types.OrderedPair(37.5400704785722, 81.1913152210981),
        ),
@@ -63,7 +63,7 @@ ELLIPSES = [
            size=common_types.Size(6.32943048766625, 31.4288962146186),
            name="name: ellipse - invisible",
            rotation=0,
-            type="ellipse",
+            class_="ellipse",
            visible=False,
            coordinates=common_types.OrderedPair(22.6986472661134, 53.9092872570194),
        ),
@@ -88,7 +88,7 @@ ELLIPSES = [
            size=common_types.Size(29.6828464249176, 24.2264408321018),
            name="name: ellipse - rotated",
            rotation=111,
-            type="ellipse",
+            class_="ellipse",
            visible=True,
            coordinates=common_types.OrderedPair(35.7940206888712, 120.040923041946),
        ),
@@ -112,7 +112,7 @@ ELLIPSES = [
            id=29,
            name="name: ellipse - no width or height",
            rotation=0,
-            type="ellipse",
+            class_="ellipse",
            visible=True,
            coordinates=common_types.OrderedPair(72.4610662725929, 127.679890871888),
        ),
@@ -139,7 +139,7 @@ RECTANGLES = [
            size=common_types.Size(45.3972945322269, 41.4686825053996),
            name="name: rectangle",
            rotation=0,
-            type="rectangle",
+            class_="rectangle",
            visible=True,
            coordinates=common_types.OrderedPair(27.7185404115039, 23.571672160964),
        ),
@@ -163,7 +163,7 @@ RECTANGLES = [
            size=common_types.Size(30.9923837671934, 32.7384335568944),
            name="name:  rectangle - invisible",
            rotation=0,
-            type="rectangle",
+            class_="rectangle",
            visible=False,
            coordinates=common_types.OrderedPair(163.910424008185, 91.0128452881664),
        ),
@@ -187,7 +187,7 @@ RECTANGLES = [
            size=common_types.Size(10, 22),
            name="name:  rectangle - rotated",
            rotation=10,
-            type="rectangle",
+            class_="rectangle",
            visible=True,
            coordinates=common_types.OrderedPair(183.335227918609, 23.3534159372513),
        ),
@@ -211,7 +211,7 @@ RECTANGLES = [
            size=common_types.Size(0, 0),
            name="name: rectangle - no width or height",
            rotation=0,
-            type="rectangle",
+            class_="rectangle",
            visible=True,
            coordinates=common_types.OrderedPair(131.17199045129, 53.4727748095942),
        ),
@@ -266,7 +266,7 @@ RECTANGLES = [
            size=common_types.Size(21.170853700125, 13.7501420938956),
            name="name: rectangle - properties",
            rotation=0,
-            type="rectangle",
+            class_="rectangle",
            visible=True,
            coordinates=common_types.OrderedPair(39.0678640445606, 131.826759122428),
            properties={
@@ -301,7 +301,7 @@ POINTS = [
            id=2,
            name="name:  point",
            rotation=0,
-            type="point",
+            class_="point",
            visible=True,
            coordinates=common_types.OrderedPair(159.981811981357, 82.9373650107991),
        ),
@@ -325,7 +325,7 @@ POINTS = [
            id=3,
            name="name:  point invisible",
            rotation=0,
-            type="point",
+            class_="point",
            visible=False,
            coordinates=common_types.OrderedPair(109.346368080027, 95.8144822098443),
        ),
@@ -353,7 +353,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile",
            rotation=0,
-            type="tile",
+            class_="tile",
            visible=True,
            coordinates=common_types.OrderedPair(111.898147095601, 48.3019211094691),
            gid=79,
@@ -379,7 +379,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile - invisible",
            rotation=0,
-            type="tile",
+            class_="tile",
            visible=False,
            coordinates=common_types.OrderedPair(41.1831306127089, 168.779356598841),
            gid=80,
@@ -405,7 +405,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile - horizontal flipped",
            rotation=0,
-            type="tile",
+            class_="tile",
            visible=True,
            coordinates=common_types.OrderedPair(197.236330567239, 59.8695009662385),
            gid=2147483742,
@@ -431,7 +431,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile - vertical flipped",
            rotation=0,
-            type="tile",
+            class_="tile",
            visible=True,
            coordinates=common_types.OrderedPair(32.4528816642037, 60.742525861089),
            gid=1073741918,
@@ -457,7 +457,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile - both flipped",
            rotation=0,
-            type="tile",
+            class_="tile",
            visible=True,
            coordinates=common_types.OrderedPair(167.553484142321, 95.6635216551097),
            gid=3221225558,
@@ -483,7 +483,7 @@ TILES = [
            size=common_types.Size(32, 32),
            name="name: tile - rotated",
            rotation=89,
-            type="tile",
+            class_="tile",
            visible=True,
            coordinates=common_types.OrderedPair(85.65, 142.62),
            gid=86,
@@ -538,7 +538,7 @@ POLYGONS = [
                common_types.OrderedPair(25.317721950665, 16.3692167784472),
            ],
            rotation=0,
-            type="polygon",
+            class_="polygon",
            visible=True,
            coordinates=common_types.OrderedPair(89.485051722178, 38.6313515971354),
        ),
@@ -579,7 +579,7 @@ POLYGONS = [
                common_types.OrderedPair(-14.8414232124588, -10.2580425144936),
            ],
            rotation=0,
-            type="polygon",
+            class_="polygon",
            visible=False,
            coordinates=common_types.OrderedPair(133.791065135842, 24.4446970558145),
        ),
@@ -635,7 +635,7 @@ POLYGONS = [
                common_types.OrderedPair(-3.71035580311471, 8.29373650107991),
            ],
            rotation=123,
-            type="polygon",
+            class_="polygon",
            visible=True,
            coordinates=common_types.OrderedPair(152.779356598841, 19.8613163578493),
        ),
@@ -679,7 +679,7 @@ POLYLINES = [
                common_types.OrderedPair(21.3891099238377, 16.8057292258725),
            ],
            rotation=0,
-            type="polyline",
+            class_="polyline",
            visible=True,
            coordinates=common_types.OrderedPair(124.187791292486, 90.1398203933159),
        ),
@@ -720,7 +720,7 @@ POLYLINES = [
                common_types.OrderedPair(5, 23.6666666666667),
            ],
            rotation=0,
-            type="polyline",
+            class_="polyline",
            visible=False,
            coordinates=common_types.OrderedPair(140, 163.333333333333),
        ),
@@ -761,7 +761,7 @@ POLYLINES = [
                common_types.OrderedPair(-5.33333333333331, 19.6666666666667),
            ],
            rotation=0,
-            type="polyline",
+            class_="polyline",
            visible=True,
            coordinates=common_types.OrderedPair(192.333333333333, 128.666666666667),
        ),
@@ -792,7 +792,7 @@ TEXTS = [
            id=19,
            name="name: text",
            text="Hello World",
-            type="text",
+            class_="text",
            wrap=True,
            rotation=0,
            visible=True,
@@ -824,7 +824,7 @@ TEXTS = [
            name="name: text - invisible",
            text="Hello World",
            wrap=True,
-            type="text",
+            class_="text",
            rotation=0,
            visible=False,
            size=common_types.Size(92.375, 19),
@@ -856,7 +856,7 @@ TEXTS = [
            text="Hello World",
            wrap=True,
            rotation=19,
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(157.882069171308, 78.4572581561896),
@@ -893,7 +893,7 @@ TEXTS = [
            font_family="DejaVu Sans",
            font_size=19,
            rotation=0,
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(2.70189411162896, 101.592417869728),
@@ -922,7 +922,7 @@ TEXTS = [
            name="name: text - no word wrap",
            text="Hello World",
            rotation=0,
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(9.90434949414573, 154.192167784472),
@@ -957,7 +957,7 @@ TEXTS = [
            horizontal_align="right",
            vertical_align="bottom",
            rotation=0,
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(151.989151131067, 1.19455496191883),
@@ -991,7 +991,7 @@ TEXTS = [
            wrap=True,
            horizontal_align="center",
            vertical_align="center",
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(4.22968767761736, 3.81362964647039),
@@ -1023,7 +1023,7 @@ TEXTS = [
            text="Hello World",
            wrap=True,
            horizontal_align="justify",
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(13.8329615209731, 60.7785040354666),
@@ -1055,7 +1055,7 @@ TEXTS = [
            text="Hello World",
            wrap=True,
            color=common_types.Color(170, 0, 0, 255),
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(96.3338140843469, 130.620495623508),
@@ -1096,7 +1096,7 @@ TEXTS = [
            text="Hello World",
            underline=True,
            wrap=True,
-            type="text",
+            class_="text",
            visible=True,
            size=common_types.Size(92.375, 19),
            coordinates=common_types.OrderedPair(33, 22),
--- a/tests/test_tiled_object_tmx.py
+++ b/tests/test_tiled_object_tmx.py
@@ -460,7 +460,7 @@ TILES = [
            id=13,
            size=common_types.Size(32, 32),
            name="tile - invisible",
-            type="tile",
+            class_="tile",
            coordinates=common_types.OrderedPair(111.8981, 48.3019),
            gid=79,
            visible=False,