Tiled 1.9 Compatibility Update

2025-12-30 08:08:55 +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/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>