From d959bbfd569977b8545d3b0413d4e37b303a48b7 Mon Sep 17 00:00:00 2001
From: Darren Eberly <darren.eberly@gmail.com>
Date: Sat, 28 Aug 2021 12:00:02 -0400
Subject: [PATCH] Default layer offsets to 0, 0 if not present

---
 pytiled_parser/layer.py                                 | 2 +-
 tests/test_data/layer_tests/all_layer_types/expected.py | 2 ++
 tests/test_data/layer_tests/all_layer_types/map.json    | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pytiled_parser/layer.py b/pytiled_parser/layer.py
index 194e3cb..6dd2fe7 100644
--- a/pytiled_parser/layer.py
+++ b/pytiled_parser/layer.py
@@ -56,10 +56,10 @@ class Layer:
 
     coordinates: OrderedPair = OrderedPair(0, 0)
     parallax_factor: OrderedPair = OrderedPair(1, 1)
+    offset: OrderedPair = OrderedPair(0, 0)
 
     id: Optional[int] = None
     size: Optional[Size] = None
-    offset: Optional[OrderedPair] = None
     properties: Optional[properties_.Properties] = None
     tint_color: Optional[Color] = None
 
diff --git a/tests/test_data/layer_tests/all_layer_types/expected.py b/tests/test_data/layer_tests/all_layer_types/expected.py
index 0279b32..6b24eb0 100644
--- a/tests/test_data/layer_tests/all_layer_types/expected.py
+++ b/tests/test_data/layer_tests/all_layer_types/expected.py
@@ -108,6 +108,7 @@ EXPECTED = [
     ),
     layer.ImageLayer(
         name="Image Layer 1",
+        offset=common_types.OrderedPair(1, 4),
         opacity=1,
         visible=True,
         id=3,
@@ -117,6 +118,7 @@ EXPECTED = [
     ),
     layer.ImageLayer(
         name="Image Layer 2",
+        offset=common_types.OrderedPair(0, 0),
         opacity=1,
         visible=True,
         id=5,
diff --git a/tests/test_data/layer_tests/all_layer_types/map.json b/tests/test_data/layer_tests/all_layer_types/map.json
index 7229b3a..a04bdd6 100644
--- a/tests/test_data/layer_tests/all_layer_types/map.json
+++ b/tests/test_data/layer_tests/all_layer_types/map.json
@@ -64,6 +64,8 @@
          "id":3,
          "image":"..\/..\/images\/tile_04.png",
          "name":"Image Layer 1",
+         "offsetx":1,
+         "offsety":4,
          "opacity":1,
          "tintcolor":"#ff0000",
          "transparentcolor":"#000000",
@@ -88,7 +90,7 @@
  "nextobjectid":3,
  "orientation":"orthogonal",
  "renderorder":"right-down",
- "tiledversion":"1.6.0",
+ "tiledversion":"1.7.2",
  "tileheight":32,
  "tilesets":[
         {