Merge pull request osmlab#365 from mvexel/master

handle optional osmids well, disable tap to dismiss toast messages

Author: mvexel

jsx/maproulette.js

@@ -21,15 +21,15 @@ toastr.options = {
   "toastClass": "notification",
   "positionClass": "toast-top-left",
   "preventDuplicates": false,
-  "onclick": null,
   "showDuration": "300",
   "hideDuration": "1000",
   "timeOut": "3000",
   "extendedTimeOut": "0",
   "showEasing": "swing",
   "hideEasing": "linear",
   "showMethod": "fadeIn",
-  "hideMethod": "fadeOut"
+  "hideMethod": "fadeOut",
+  "tapToDismiss" : false
 };
 
 // React Components

manage.py

@@ -118,13 +118,11 @@ def create_testdata(challenges=10, tasks=100, users=10):
             # create a linestring connecting the two points
             # no constructor for linestring from points?
             l1 = LineString([(p1.x, p1.y), (p2.x, p2.y)])
-            # generate some random 'osm ids'
-            osmids = [random.randrange(1000000, 1000000000) for _ in range(2)]
             # add the first point and the linestring to the task's geometries
-            task_geometries.append(TaskGeometry(osmids[0], p1))
+            task_geometries.append(TaskGeometry(p1))
             # set a linestring for every other challenge
             if not j % 2:
-                task_geometries.append(TaskGeometry(osmids[1], l1))
+                task_geometries.append(TaskGeometry(l1))
             # instantiate the task and register it with challenge 'test'
             # Initialize a task with its challenge slug and persistent ID
             task = Task(challenge.slug, identifier, task_geometries)

maproulette/api/__init__.py

@@ -819,12 +819,15 @@ def post(self, slug):
         for task in data:
             app.logger.debug(task)
             if not isinstance(task['identifier'], basestring):
+                app.logger.debug('identifier not a string')
                 abort(400, message='task identifier must exist and be string')
             existingTask = get_task_or_none(slug, task['identifier'])
             if existingTask is None:
                 if not re.match("^[\w\d_-]+$", task['identifier']):
+                    app.logger.debug('identifier should contain only a-z, A-Z, 0-9, _, -')
                     abort(400, message='identifier should contain only a-z, A-Z, 0-9, _, -')
                 if 'geometries' not in task:
+                    app.logger.debug('new task must have geometries')
                     abort(400, message='new task must have geometries')
                 t = json_to_task(slug, task)
                 db.session.add(t)

maproulette/helpers.py

@@ -181,10 +181,14 @@ def json_to_task(slug, data, task=None, identifier=None):
     if 'geometries' in data:
         geometries = data.pop('geometries')
         # parse the geometries
+        app.logger.debug(geometries)
         for feature in geometries['features']:
-            osmid = feature['properties'].get('osmid')
+            osmid = None
+            if 'properties' in feature and feature['properties'].get('osmid'):
+                osmid = feature['properties'].get('osmid')
+            app.logger.debug(feature)
             shape = asShape(feature['geometry'])
-            g = TaskGeometry(osmid, shape)
+            g = TaskGeometry(shape, osmid)
             task.geometries.append(g)
     return task
 

maproulette/models.py

@@ -357,7 +357,7 @@ class TaskGeometry(db.Model):
         Geometry,
         nullable=False)
 
-    def __init__(self, osmid, shape):
+    def __init__(self, shape, osmid=None):
         self.osmid = osmid
         self.geom = from_shape(shape)