Changeset 7999 in josm for trunk

Timestamp:

2015-02-02T21:29:44+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #11061 - Remote API imagery cookies parameter is not handled properly (patch by p.janaszek)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/TMSLayer.java (modified) (1 diff)
• io/remotecontrol/handler/ImageryHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -375 +375 @@
         if (info.getImageryType() == ImageryType.TMS) {
             checkUrl(info.getUrl());
-            TMSTileSource t = new TemplatedTMSTileSource(info.getName(), info.getUrl(), info.getId(), info.getMinZoom(), info.getMaxZoom());
+            TMSTileSource t = new TemplatedTMSTileSource(info.getName(), info.getUrl(), info.getId(), info.getMinZoom(), info.getMaxZoom(),
+                    info.getCookies());
             info.setAttribution(t);
             return t;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -146 +146 @@
         String url = args.get("url");
         String type = args.get("type");
+        String cookies = args.get("cookies");
         try {
-            ImageryLayer.create(new ImageryInfo(null, url, type, null, null));
+            ImageryLayer.create(new ImageryInfo(null, url, type, null, cookies));
         } catch (IllegalArgumentException e) {
             throw new RequestHandlerBadRequestException(e.getMessage(), e);