From e9bb7d340ebd7e578ca35565d7467f982a9a81ec Mon Sep 17 00:00:00 2001
From: Jens <jmw.1906@gmx.de>
Date: Thu, 6 Feb 2020 20:14:08 +0100
Subject: [PATCH] Add regiondir property to CroppedRegionSet

- CroppedRegionSet is a Wrapper for RegionSet and should have all of
  it's Variables / Parameters
- genPOI sorts a list by (Cropped)RegionSet objects
- The comparing method (__lt__) was correct in CroppedRegionSet but not
  in RegionSet. To prevent this issue from happening again, the
  RegionSetWrapper now has the regiondir property, too
- Fixes Issue: #1706
- Example config: see below

def testFilter(poi):
    if poi['id'] == 'Town':
        return poi['name']
def townFilter(poi):
    if poi['id'] == 'Town':
        return poi['name']

renders["normalrender"] = {
    "world": "Test12985",
    "title": "Normal Render of Testworld",
    'markers': [dict(name="Towns", filterFunction=townFilter), dict(name="Test", filterFunction=testFilter)],
}

renders["secondrender"] = {
    "world": "Test12985",
    "title": "Second Render of Testworld",
    "crop": (180, -230, 220, -260),
    'markers': [dict(name="Towns", filterFunction=townFilter), dict(name="Test", filterFunction=testFilter)],
}
---
 overviewer_core/world.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/overviewer_core/world.py b/overviewer_core/world.py
index faa172d..195ae97 100644
--- a/overviewer_core/world.py
+++ b/overviewer_core/world.py
@@ -1547,9 +1547,24 @@ class RegionSetWrapper(object):
         itertools.groupby, which needs sorted keys, and Python 2 somehow
         just sorted objects like ???????? how????? why?????
         """
-        if isinstance(other, RegionSetWrapper):
-            other = other._r
-        return self._r.regiondir < other.regiondir
+        return self.regiondir < other.regiondir
+
+    @property
+    def regiondir(self):
+        """
+        RegionSetWrapper are wrappers around a RegionSet and thus should have all variables the RegionSet has.
+
+        Reason for addition: Issue #1706
+        The __lt__ check in RegionSet did not check if it is a RegionSetWrapper Instance
+        """
+        return self._r.regiondir
+
+    @regiondir.setter
+    def regiondir(self, value):
+        """
+        For completeness adding the setter to the property
+        """
+        self._r.regiondir = value
 
     def get_type(self):
         return self._r.get_type()