Moving priority rule enums, cleanup

Author: adam-t-shaw

docs/usage/models/enums.rst

@@ -0,0 +1,33 @@
+Enums
+=====================================================
+
+.. autoclass:: maproulette.models.enums.Conditions
+    :members:
+
+.. autoclass:: maproulette.models.enums.Types
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.StringOperators
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.NumericOperators
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.OSMObjects
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.OperationTypes
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.Operations
+    :members:
+    :undoc-members:
+
+.. autoclass:: maproulette.models.enums.CooperativeWorkTypes
+    :members:
+    :undoc-members:

docs/usage/models/priority_rule.rst

@@ -6,22 +6,3 @@ Priority Rule Model
 
 .. autoclass:: maproulette.models.priority_rule.PriorityRuleModel
     :members:
-
-.. autoclass:: maproulette.models.priority_rule.Conditions
-    :members:
-
-.. autoclass:: maproulette.models.priority_rule.Types
-    :members:
-    :undoc-members:
-
-.. autoclass:: maproulette.models.priority_rule.Conditions
-    :members:
-    :undoc-members:
-
-.. autoclass:: maproulette.models.priority_rule.StringOperators
-    :members:
-    :undoc-members:
-
-.. autoclass:: maproulette.models.priority_rule.NumericOperators
-    :members:
-    :undoc-members:

maproulette/models/priority_rule.py

@@ -1,50 +1,7 @@
 """This module contains the definition of a priority rule object in MapRoulette."""
 
 import json
-from enum import Enum, auto
-
-
-class ExtendedEnum(Enum):
-    def _generate_next_value_(name, start, count, last_values):
-        return name.lower()
-
-    @classmethod
-    def list(cls):
-        return [i.value for i in cls]
-
-
-class Conditions(ExtendedEnum):
-    """An enumeration of valid logical conditions for a priority rule object"""
-    OR = "OR"
-    AND = "AND"
-
-
-class Types(ExtendedEnum):
-    """An enumeration of valid types for a priority rule object"""
-    STRING = auto()
-    INTEGER = auto()
-    DOUBLE = auto()
-    LONG = auto()
-
-
-class StringOperators(ExtendedEnum):
-    """An enumeration of valid string operators for a priority rule object"""
-    EQUAL = auto()
-    NOT_EQUAL = auto()
-    CONTAINS = auto()
-    NOT_CONTAINS = auto()
-    IS_EMPTY = auto()
-    IS_NOT_EMPTY = auto()
-
-
-class NumericOperators(ExtendedEnum):
-    """An enumeration of valid numeric operators for a priority rule object"""
-    EQUAL_TO = "=="
-    NOT_EQUAL_TO = "!="
-    LESS_THAN = "<"
-    LESS_THAN_OR_EQUAL = "<="
-    GREATER_THAN = ">"
-    GREATER_THAN_OR_EQUAL = ">="
+from .enums import Conditions, Types, StringOperators, NumericOperators
 
 
 class PriorityRuleModel:

maproulette/models/task.py

@@ -203,7 +203,8 @@ def to_dict(self):
             "bundleId": self._bundle_id,
             "isBundlePrimary": self._is_bundle_primary,
             "mapillaryImages": self._mapillary_images,
-            "cooperativeWork": self._cooperative_work}
+            "cooperativeWork": self._cooperative_work
+        }
 
         return {k: v for (k, v) in properties.items() if v is not None}