add citizens

src/duckietown_world/data/gd2/udem1/citizens.yaml

@@ -0,0 +1,3 @@
+citizens:
+  map_1/duckie1:
+    color: yellow

src/duckietown_world/data/gd2/udem1/frames.yaml

@@ -11,4 +11,9 @@ frames:
   map_1/watchtower1/watchtower2:
     relative_to: map_1/watchtower1
     pose:
-      y: 0.9
+      y: 0.9
+  map_1/duckie1:
+    relative_to: ~
+    pose:
+      x: 1
+      y: 1

src/duckietown_world/data/gd2/udem1/main.yaml

@@ -3,4 +3,5 @@ main:
   tile_maps:   !include tile_maps.yaml
   tiles:       !include tiles.yaml
   watchtowers: !include watchtowers.yaml
-  groups:      !include groups.yaml
+  groups:      !include groups.yaml
+  citizens:    !include citizens.yaml

src/duckietown_world/structure_2/duckietown_map.py

@@ -35,6 +35,7 @@ class DuckietownMap(IBaseMap, ABC):
         'tiles': LayerTiles,
         'watchtowers': LayerWatchtowers,
         'groups': LayerGroups,
+        'citizens': LayerCitizens
     })
 
     def __getattr__(self, item):

src/duckietown_world/structure_2/layers.py

@@ -4,7 +4,7 @@
 from pprint import pformat
 
 from .base_map import IBaseMap
-from .objects import _Object, _Frame, _Tile, _Group, _TileMap, _Watchtower
+from .objects import _Object, _Frame, _Tile, _Group, _TileMap, _Watchtower, _Citizen
 
 
 class AbstractLayer(metaclass=ABCMeta):
@@ -81,3 +81,9 @@ class LayerGroups(AbstractLayer, ABC):
     @classmethod
     def item_type(cls) -> type:
         return _Group
+
+
+class LayerCitizens(AbstractLayer, ABC):
+    @classmethod
+    def item_type(cls) -> type:
+        return _Citizen

src/duckietown_world/structure_2/objects.py

@@ -5,7 +5,7 @@
 
 
 __all__ = ['_Object', '_Pose', '_Frame', '_TileMap', '_Tile', '_Watchtower', '_Group',
-           'ConstructedObject', 'Watchtower']
+           'ConstructedObject', 'Watchtower', '_Citizen']
 
 
 @dataclass
@@ -57,6 +57,15 @@ class _Tile(_Object):
     orientation: Optional[str] = None
 
 
+@dataclass
+class _Citizen(_Object):
+    color: str = 'yellow'
+
+    def __init__(self, color='yellow', dm=None):
+        super().__init__(dm)
+        self.color = color
+
+
 @dataclass
 class _Watchtower(_Object):
     configuration: str = 'WT18'

src/duckietown_world_tests/layers_structure_2.py

@@ -31,6 +31,8 @@ def layers_map():
     print("------------------------------------------------------")
     print(dm.watchtowers)
     print("------------------------------------------------------")
+    print(dm.citizens)
+
 
 
 if __name__ == "__main__":