Merge pull request #59 from osmlab/dev

Merging dev -> master

Author: mattmanley

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.2.1](https://github.com/osmlab/maproulette-python-client/compare/v1.2.0...v1.2.1)
+
+> 24 June 2020
+
+- Merging dev > master [`#49`](https://github.com/osmlab/maproulette-python-client/pull/49)
+- Add changelog [`#47`](https://github.com/osmlab/maproulette-python-client/pull/47)
+- Fixed challenge model issue [`#48`](https://github.com/osmlab/maproulette-python-client/pull/48)
+- add changelog [`a735e45`](https://github.com/osmlab/maproulette-python-client/commit/a735e45693dad6ea501ccfefbaced77d3fd3ab63)
+- Update __init__.py [`dbdf591`](https://github.com/osmlab/maproulette-python-client/commit/dbdf5911762f7de01dfe1c4bf350a835794e43bb)
+
 #### [v1.2.0](https://github.com/osmlab/maproulette-python-client/compare/v1.1.0...v1.2.0)
 
 > 24 June 2020

maproulette/__init__.py

@@ -14,4 +14,4 @@
 from .api.task import Task
 from .api.user import User
 
-__version__ = '1.2.1'
+__version__ = '1.3.1'

maproulette/api/challenge.py

@@ -302,7 +302,7 @@ def update_challenge(self, challenge_id, data):
         if self.is_challenge_model(data):
             data = ChallengeModel.to_dict(data)
         response = self.put(
-            endpoint=f"/challenge{challenge_id}",
+            endpoint=f"/challenge/{challenge_id}",
             body=data)
         return response
 

maproulette/models/challenge.py

@@ -296,13 +296,22 @@ def remote_geojson(self):
     def remote_geojson(self, value):
         self._remote_geojson = value
 
+    @property
+    def keywords(self):
+        """A string or list of strings pertaining to the keywords of this challenge"""
+        return self._keywords
+
+    @keywords.setter
+    def keywords(self, value):
+        self._keywords = value
+
     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,
                  high_priority_rule=None, medium_priority_rule=None, low_priority_rule=None, default_zoom=None, min_zoom=None, max_zoom=None,
                  osm_id_property=None, cooperative_type=None, popularity=None, check_in_comment=None,
                  check_in_source=None, requires_local=None, default_basemap=None, default_basemap_id=None,
                  custom_basemap=None, update_tasks=None, exportable_properties=None, preferred_tags=None,
-                 task_styles=None, remote_geojson=None):
+                 task_styles=None, remote_geojson=None, keywords=None):
         self._id = id
         self._name = name
         self._description = description
@@ -335,6 +344,7 @@ def __init__(self, name, id=None, description=None, parent=None, instruction=Non
         self._preferred_tags = preferred_tags
         self._task_styles = task_styles
         self._remote_geojson = remote_geojson
+        self._keywords = keywords
 
     def to_dict(self):
         """Converts all non-null properties of a challenge object into a dictionary"""
@@ -360,8 +370,8 @@ def to_dict(self):
             "osmIdProperty": self._osm_id_property,
             "cooperativeType": self._cooperative_type,
             "popularity": self._popularity,
-            "checkInComment": self._check_in_comment,
-            "checkInSource": self._check_in_source,
+            "checkinComment": self._check_in_comment,
+            "checkinSource": self._check_in_source,
             "requiresLocal": self._requires_local,
             "defaultBasemap": self._default_basemap,
             "defautlBasemapId": self._default_basemap_id,
@@ -370,7 +380,8 @@ def to_dict(self):
             "exportableProperties": self._exportable_properties,
             "preferredTags": self._preferred_tags,
             "taskStyles": self._task_styles,
-            "remoteGeoJson": self.remote_geojson
+            "remoteGeoJson": self._remote_geojson,
+            "tags": self._keywords
         }
         return {k: v for (k, v) in properties.items() if v is not None}