Changeset 3852 in josm

Timestamp:

2011-02-04T10:16:38+01:00 (13 years ago)

Author:

Upliner

Message:

Offset server bugfixes and debug info

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/ImageryLayer.java (modified) (1 diff)
• io/imagery/OsmosnimkiOffsetServer.java (modified) (3 diffs)

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

@@ -269 +269 @@
         public void run() {
             if (!offsetServerSupported) {
-                if (!offsetServer.isLayerSupported(getInfo())) return;
+                if (!offsetServer.isLayerSupported(info)) return;
                 offsetServerSupported = true;
             }

trunk/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.BufferedReader;
@@ -25 +27 @@
         try {
             URL url = new URL(this.url + "action=CheckAvailability&id=" + URLEncoder.encode(info.getFullUrl(), "UTF-8"));
+            System.out.println(tr("Querying offset availability: {0}", url));
             final BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openConnection().getInputStream(), "UTF-8"));
             String response = rdr.readLine();
+            System.out.println(tr("Offset server response: {0}", response));
             if (response.contains("\"offsets_available\": true")) return true;
         } catch (Exception e) {
@@ -38 +42 @@
         LatLon ll = Main.proj.eastNorth2latlon(en);
         try {
-            URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getUrl(), "UTF-8"));
+            URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getFullUrl(), "UTF-8"));
+            System.out.println(tr("Querying offset: {0}", url.toString()));
             final BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openConnection().getInputStream(), "UTF-8"));
             String s = rdr.readLine();