Change properties

maproulette/models/challenge.py

@@ -26,24 +26,6 @@ def name(self):
     def name(self, value):
         self._name = value
 
-    @property
-    def created(self):
-        """Time stamp of when the challenge was created"""
-        return self._created
-
-    @created.setter
-    def created(self, value):
-        self._created = value
-
-    @property
-    def modified(self):
-        """Time stamp pf when the challenge was last modified"""
-        return self._modified
-
-    @modified.setter
-    def modified(self, value):
-        self._modified = value
-
     @property
     def description(self):
         """The description for the challenge"""
@@ -53,15 +35,6 @@ def description(self):
     def description(self, value):
         self._description = value
 
-    @property
-    def deleted(self):
-        """Whether a challenge has been deleted or not"""
-        return self._deleted
-
-    @deleted.setter
-    def deleted(self, value):
-        self._deleted = value
-
     @property
     def parent(self):
         """The parent ID for the challenge"""
@@ -125,15 +98,6 @@ def featured(self):
     def featured(self, value):
         self._featured = value
 
-    @property
-    def virtual_parents(self):
-        """The virtual parents of a challenge"""
-        return self._virtual_parents
-
-    @virtual_parents.setter
-    def virtual_parents(self, value):
-        self._virtual_parents = value
-
     @property
     def overpassQL(self):
         """The Overpass query for this challenge"""
@@ -180,56 +144,39 @@ def max_zoom(self, value):
         self._max_zoom = value
 
     @property
-    def last_task_refresh(self):
-        """Timestamp of when the challenge's tasks were last refreshed"""
-        return self._last_task_refresh
-
-    @last_task_refresh.setter
-    def last_task_refresh(self, value):
-        self._last_task_refresh = value
-
-    @property
-    def data_origin_date(self):
-        """Timestamp of when data was originated"""
-        return self._data_origin_date
+    def osm_id_property(self):
+        """The id property of an osm feature"""
+        return self._osm_id_property
 
-    @data_origin_date.setter
-    def data_origin_date(self, value):
-        self._data_origin_date = value
+    @osm_id_property.setter
+    def osm_id_property(self, value):
+        self._osm_id_property = value
 
-    def __init__(self, name, id=None, created=None, modified=None, description=None, deleted = None, parent=None,
-                 instruction=None, difficulty=None, blurb=None, enabled=None, challenge_type=None, featured=None,
-                 virtual_parents=None, overpassQL=None, default_priority=None, default_zoom=None, min_zoom=None,
-                 max_zoom=None, last_task_refresh=None, data_origin_date=None):
+    def __init__(self, name, id=None, description=None, parent=None, instruction=None, difficulty=None, blurb=None,
+                 enabled=None, challenge_type=None, featured=None, overpassQL=None, default_priority=None,
+                 default_zoom=None, min_zoom=None, max_zoom=None, osm_id_property=None):
         self._id = id
         self._name = name
-        self._created = created
-        self._modified = modified
         self._description = description
-        self._deleted = deleted
         self._parent = parent
         self._instruction = instruction
         self._difficulty = difficulty
         self._blurb = blurb
         self._enabled = enabled
         self._challenge_type = challenge_type
         self._featured = featured
-        self._virtual_parents = virtual_parents
         self._overpassQL = overpassQL
         self._default_priority = default_priority
         self._default_zoom = default_zoom
         self._min_zoom = min_zoom
         self._max_zoom = max_zoom
-        self._last_task_refresh = last_task_refresh
-        self._data_origin_date = data_origin_date
+        self._osm_id_property = osm_id_property
 
     def to_dict(self):
         """Converts all non-null properties of a challenge object into a dictionary"""
         properties = {
             "id": self._id,
             "name": self._name,
-            "created": self._created,
-            "modified": self._modified,
             "description": self._description,
             "deleted": self.description,
             "parent": self._parent,
@@ -239,14 +186,12 @@ def to_dict(self):
             "enabled": self._enabled,
             "challengeType": self._challenge_type,
             "featured": self._featured,
-            "virtualParents": self._virtual_parents,
             "overpassQL": self._overpassQL,
             "defaultPriority": self._default_priority,
             "defaultZoom": self._default_zoom,
             "minZoom": self._min_zoom,
             "maxZoom": self._max_zoom,
-            "lastTaskRefresh": self._last_task_refresh,
-            "dataOriginDate": self._data_origin_date
+            "osmIdProperty": self._osm_id_property
         }
         return {k: v for (k, v) in properties.items() if v is not None}