From 7879bf6dfa34bfd37f895f751deeb628f70c2835 Mon Sep 17 00:00:00 2001
From: grin <Peter Gervai grin@grin.hu>
Date: Tue, 25 Apr 2017 10:37:40 +0200
Subject: [PATCH 1/2] Insert JOSM/SSL remote control

---
 osmtm/static/js/project.js        | 37 +++++++++++++++++++++++++++++--
 osmtm/templates/task.editors.mako |  1 +
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/osmtm/static/js/project.js b/osmtm/static/js/project.js
index 2468cd65..3312acff 100644
--- a/osmtm/static/js/project.js
+++ b/osmtm/static/js/project.js
@@ -107,7 +107,9 @@ osmtm.project = (function() {
     lmap = L.map('leaflet');
     L.control.scale().addTo(lmap);
     // create the tile layer with correct attribution
-    var osmUrl='//tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png';
+//    var osmUrl='//tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png';
+    var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+
     var osmAttrib=osmAttribI18n;
     var osm = new L.TileLayer(osmUrl, {attribution: osmAttrib});
     lmap.addLayer(osm);
@@ -393,7 +395,7 @@ osmtm.project = (function() {
         if (typeof imagery_url != "undefined" && imagery_url !== '') {
           source=encodeURIComponent(imagery_url);
         } else {
-          source="Bing";
+          source="ortofoto-undef";
         }
         return options.base + decodeURIComponent($.param({
           left: roundd(bounds[0],5),
@@ -454,6 +456,37 @@ osmtm.project = (function() {
         }
       });
       break;
+      case "josmssl":
+      if (typeof licenseAgreementUrl != 'undefined') {
+        alert(requiresLicenseAgreementMsg);
+        window.location = licenseAgreementUrl;
+        break;
+      }
+      url = getLink({
+        base: 'https://127.0.0.1:8112/load_and_zoom?',
+        bounds: task_bounds,
+        protocol: 'lbrt'
+      });
+      $.ajax({
+        url: url,
+        complete: function(t) {
+          if (t.status != 200) {
+            alert(josmRcDidNotRespondI18n);
+          } else {
+            if (typeof imagery_url != "undefined" && imagery_url !== '') {
+              $.ajax({
+                url: 'https://127.0.0.1:8112/imagery',
+                data: {
+                  title: "Tasking Manager - #" + project_id,
+                  type: imagery_url.toLowerCase().substring(0,3),
+                  url: imagery_url
+                }
+              });
+            }
+          }
+        }
+      });
+      break;
       case "potlatch2":
       url = getLink({
         base: 'http://www.openstreetmap.org/edit?editor=potlatch2&',
diff --git a/osmtm/templates/task.editors.mako b/osmtm/templates/task.editors.mako
index 5e80d59e..1d67ec24 100644
--- a/osmtm/templates/task.editors.mako
+++ b/osmtm/templates/task.editors.mako
@@ -12,6 +12,7 @@
     </button>
     <ul id="editDropdown" class="dropdown-menu text-left">
       <li id="josm"><a role="menuitem">JOSM</a></li>
+      <li id="josmssl"><a role="menuitem">JOSM-SSL</a></li>
       <li id="iDeditor"><a role="menuitem">iD editor</a></li>
       <li id="potlatch2"><a role="menuitem">Potlatch 2</a></li>
       <li id="wp"><a role="menuitem">Walking Papers</a></li>

From 6388ad662a405c42e179f6992f3d745552b973aa Mon Sep 17 00:00:00 2001
From: grin <Peter Gervai grin@grin.hu>
Date: Tue, 25 Apr 2017 10:41:06 +0200
Subject: [PATCH 2/2] revert unrelated changes

---
 osmtm/static/js/project.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osmtm/static/js/project.js b/osmtm/static/js/project.js
index 3312acff..33d4cc11 100644
--- a/osmtm/static/js/project.js
+++ b/osmtm/static/js/project.js
@@ -107,8 +107,7 @@ osmtm.project = (function() {
     lmap = L.map('leaflet');
     L.control.scale().addTo(lmap);
     // create the tile layer with correct attribution
-//    var osmUrl='//tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png';
-    var osmUrl='//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+    var osmUrl='//tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png';
 
     var osmAttrib=osmAttribI18n;
     var osm = new L.TileLayer(osmUrl, {attribution: osmAttrib});
@@ -395,7 +394,7 @@ osmtm.project = (function() {
         if (typeof imagery_url != "undefined" && imagery_url !== '') {
           source=encodeURIComponent(imagery_url);
         } else {
-          source="ortofoto-undef";
+          source="Bing";
         }
         return options.base + decodeURIComponent($.param({
           left: roundd(bounds[0],5),