From 2fc4a44831816d2fea678af045756fed709eda31 Mon Sep 17 00:00:00 2001
From: Benjamin Kirkbride <benjaminkirkbride@gmail.com>
Date: Sun, 31 May 2020 00:28:03 -0400
Subject: [PATCH] rf: id attributes of objects is now `id`

---
 pytiled_parser/tiled_object.py | 26 +++++++-------
 tests/test_tiled_object.py     | 64 +++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/pytiled_parser/tiled_object.py b/pytiled_parser/tiled_object.py
index 6e50c2f..fe1b711 100644
--- a/pytiled_parser/tiled_object.py
+++ b/pytiled_parser/tiled_object.py
@@ -32,7 +32,7 @@ class TiledObject:
         template: A reference to a Template tiled object FIXME
     """
 
-    id_: int
+    id: int
     gid: Optional[int] = None
 
     coordinates: OrderedPair
@@ -189,26 +189,24 @@ def _get_common_attributes(raw_tiled_object: RawTiledObject) -> TiledObject:
     coordinates = OrderedPair(x=raw_tiled_object["x"], y=raw_tiled_object["y"])
     visible = raw_tiled_object["visible"]
 
-    common_attributes = TiledObject(id_=id_, coordinates=coordinates, visible=visible)
+    common_attributes = TiledObject(id=id_, coordinates=coordinates, visible=visible)
 
     # optional attributes
-    if any([raw_tiled_object.get("x"), raw_tiled_object.get("y")]):
+    if any([raw_tiled_object.get("width"), raw_tiled_object.get("height")]):
         # we have to check if either are truthy before we proceed to create Size
-        x: Union[int, float]
-        _x = raw_tiled_object.get("x")
-        if _x:
-            x = _x
+        _width = raw_tiled_object.get("width")
+        if _width:
+            width = _width
         else:
-            x = 0
+            width = 0
 
-        y: Union[int, float]
-        _y = raw_tiled_object.get("y")
-        if _y:
-            y = _y
+        _height = raw_tiled_object.get("height")
+        if _height:
+            height = _height
         else:
-            y = 0
+            height = 0
 
-        common_attributes.size = Size(x, y)
+        common_attributes.size = Size(width, height)
 
     if raw_tiled_object.get("rotation"):
         common_attributes.rotation = raw_tiled_object["rotation"]
diff --git a/tests/test_tiled_object.py b/tests/test_tiled_object.py
index cb78949..26624c7 100644
--- a/tests/test_tiled_object.py
+++ b/tests/test_tiled_object.py
@@ -24,7 +24,7 @@ ELLIPSES = [
         }
         """,
         tiled_object.Ellipse(
-            id_=6,
+            id=6,
             size=common_types.Size(57.4013868364215, 18.5517790155735),
             name="name: ellipse",
             rotation=0,
@@ -49,7 +49,7 @@ ELLIPSES = [
         }
         """,
         tiled_object.Ellipse(
-            id_=7,
+            id=7,
             size=common_types.Size(6.32943048766625, 31.4288962146186),
             name="name: ellipse - invisible",
             rotation=0,
@@ -74,7 +74,7 @@ ELLIPSES = [
         }
         """,
         tiled_object.Ellipse(
-            id_=8,
+            id=8,
             size=common_types.Size(29.6828464249176, 24.2264408321018),
             name="name: ellipse - rotated",
             rotation=111,
@@ -99,7 +99,7 @@ ELLIPSES = [
         }
         """,
         tiled_object.Ellipse(
-            id_=29,
+            id=29,
             name="name: ellipse - no width or height",
             rotation=0,
             type="ellipse",
@@ -125,7 +125,7 @@ RECTANGLES = [
         }
         """,
         tiled_object.Rectangle(
-            id_=1,
+            id=1,
             size=common_types.Size(45.3972945322269, 41.4686825053996),
             name="name: rectangle",
             rotation=0,
@@ -149,7 +149,7 @@ RECTANGLES = [
         }
         """,
         tiled_object.Rectangle(
-            id_=4,
+            id=4,
             size=common_types.Size(30.9923837671934, 32.7384335568944),
             name="name:  rectangle - invisible",
             rotation=0,
@@ -173,7 +173,7 @@ RECTANGLES = [
         },
         """,
         tiled_object.Rectangle(
-            id_=5,
+            id=5,
             size=common_types.Size(10, 22),
             name="name:  rectangle - rotated",
             rotation=10,
@@ -197,7 +197,7 @@ RECTANGLES = [
         }
         """,
         tiled_object.Rectangle(
-            id_=28,
+            id=28,
             size=common_types.Size(0, 0),
             name="name: rectangle - no width or height",
             rotation=0,
@@ -252,7 +252,7 @@ RECTANGLES = [
         }
         """,
         tiled_object.Rectangle(
-            id_=30,
+            id=30,
             size=common_types.Size(21.170853700125, 13.7501420938956),
             name="name: rectangle - properties",
             rotation=0,
@@ -288,7 +288,7 @@ POINTS = [
         }
         """,
         tiled_object.Point(
-            id_=2,
+            id=2,
             name="name:  point",
             rotation=0,
             type="point",
@@ -312,7 +312,7 @@ POINTS = [
         }
         """,
         tiled_object.Point(
-            id_=3,
+            id=3,
             name="name:name:  point invisible",
             rotation=0,
             type="point",
@@ -339,7 +339,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=13,
+            id=13,
             size=common_types.Size(32, 32),
             name="name: tile",
             rotation=0,
@@ -365,7 +365,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=14,
+            id=14,
             size=common_types.Size(32, 32),
             name="name: tile - invisible",
             rotation=0,
@@ -391,7 +391,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=15,
+            id=15,
             size=common_types.Size(32, 32),
             name="name: tile - horizontal flipped",
             rotation=0,
@@ -417,7 +417,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=16,
+            id=16,
             size=common_types.Size(32, 32),
             name="name: tile - vertical flipped",
             rotation=0,
@@ -443,7 +443,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=17,
+            id=17,
             size=common_types.Size(32, 32),
             name="name: tile - both flipped",
             rotation=0,
@@ -469,7 +469,7 @@ TILE_IMAGES = [
         }
         """,
         tiled_object.Tile(
-            id_=18,
+            id=18,
             size=common_types.Size(32, 32),
             name="name: tile - rotated",
             rotation=89,
@@ -518,7 +518,7 @@ POLYGONS = [
         }
         """,
         tiled_object.Polygon(
-            id_=9,
+            id=9,
             name="name: polygon",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -561,7 +561,7 @@ POLYGONS = [
         }
         """,
         tiled_object.Polygon(
-            id_=9,
+            id=9,
             name="name: polygon - invisible",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -614,7 +614,7 @@ POLYGONS = [
         }
         """,
         tiled_object.Polygon(
-            id_=9,
+            id=9,
             name="name: polygon - rotated",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -661,7 +661,7 @@ POLYLINES = [
         }
         """,
         tiled_object.Polyline(
-            id_=9,
+            id=9,
             name="name: polyline",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -702,7 +702,7 @@ POLYLINES = [
         }
         """,
         tiled_object.Polyline(
-            id_=10,
+            id=10,
             name="name: polyline - invisible",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -743,7 +743,7 @@ POLYLINES = [
         }
         """,
         tiled_object.Polyline(
-            id_=11,
+            id=11,
             name="name: polyline - rotated",
             points=[
                 common_types.OrderedPair(0, 0),
@@ -779,7 +779,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=19,
+            id=19,
             name="name: text",
             text="Hello World",
             type="text",
@@ -810,7 +810,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=20,
+            id=20,
             name="name: text - invisible",
             text="Hello World",
             wrap=True,
@@ -841,7 +841,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=21,
+            id=21,
             name="name: text - rotated",
             text="Hello World",
             wrap=True,
@@ -875,7 +875,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=22,
+            id=22,
             name="name: text - different font",
             text="Hello World",
             wrap=True,
@@ -908,7 +908,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=23,
+            id=23,
             name="name: text - no word wrap",
             text="Hello World",
             rotation=0,
@@ -940,7 +940,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=24,
+            id=24,
             name="name: text - right bottom align",
             text="Hello World",
             wrap=True,
@@ -974,7 +974,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=25,
+            id=25,
             name="text: center center align",
             rotation=0,
             text="Hello World",
@@ -1007,7 +1007,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=26,
+            id=26,
             name="name: text - justified",
             rotation=0,
             text="Hello World",
@@ -1039,7 +1039,7 @@ TEXTS = [
         }
         """,
         tiled_object.Text(
-            id_=27,
+            id=27,
             name="name: text - red",
             rotation=0,
             text="Hello World",