Merge pull request #390 from pgiraud/josm_ignore_tags

Don't import task boundary in JOSM

Author: Pierre GIRAUD

osmtm/static/js/project.js

@@ -422,17 +422,11 @@ osmtm.project = (function() {
         protocol: 'lbrt'
       });
       $.ajax({
-        url: 'http://127.0.0.1:8111/import',
-        data: {
-          url: task_osm_url
-        },
+        url: url,
         complete: function(t) {
           if (t.status != 200) {
             alert("JOSM remote control did not respond. Do you have JOSM running and configured to be controlled remotely?");
           } else {
-            $.ajax({
-              url: url
-            });
             if (typeof imagery_url != "undefined" && imagery_url !== '') {
               $.ajax({
                 url: 'http://127.0.0.1:8111/imagery',
@@ -528,6 +522,7 @@ osmtm.project = (function() {
   function setPreferedEditor() {
     if (osmtm.prefered_editor !== '') {
       $('#prefered_editor').text($('#' + osmtm.prefered_editor + ' a').text());
+      $('#josm_task_boundary_tip').toggle(osmtm.prefered_editor == 'josm');
     }
   }
 

osmtm/templates/task.editors.mako

@@ -17,6 +17,19 @@
       <li id="wp"><a role="menuitem">Walking Papers</a></li>
     </ul>
   </div>
+  <div id="josm_task_boundary_tip" class="help-block small text-left">
+    <em>
+      <i class="glyphicon glyphicon-info-sign"></i>
+      <%
+        link_to_gpx_text = _('.gpx file')
+        link_to_gpx = '<a href="%s" target="_blank">%s</a>' % (
+          request.route_url('task_gpx', project=task.project_id, task=task.id),
+          link_to_gpx_text)
+      %>
+      ${_('Tip: Download the following ${task_gpx_link} and load it in JOSM in order to see the current task boundary',
+      mapping={'task_gpx_link': link_to_gpx}) | n}
+    </em>
+  </div>
 </div>
 <script>
   osmtm.prefered_editor = "${prefered_editor}";