Changeset 31369 in osm

Timestamp:

2015-07-12T14:51:36+02:00 (9 years ago)

Author:

belecker

Message:

Change code for new Server response.

File:

• applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java

@@ -44 +44 @@
     */
     public void run() {
+        m_listLatLon = new ArrayList<>();
+        
         try {
             String strResponse = callServer("traceOrder=GetTrace"
@@ -66 +68 @@
             }
             
-            if (!strResponse.startsWith("(") || !strResponse.endsWith(")")){
+            if (strResponse.startsWith("(")) {
+                GetPoints(strResponse);
                 return;
             }
-            strResponse = strResponse.substring(1, strResponse.length()-1);
-            
-            ArrayList<LatLon> nodelist = new ArrayList<>();
-            
-            String[] astrPoints = strResponse.split("\\)\\(");
-            for (String strPoint : astrPoints) {
-                String[] astrParts = strPoint.split(":");
-                double x = Double.parseDouble(astrParts[0]);
-                double y = Double.parseDouble(astrParts[1]);
-                nodelist.add(new LatLon(x, y));
+            String[] astrParts = strResponse.split("&");
+
+            for (String strPart : astrParts) {
+                if (strPart.contains("tracePoints="))
+                {
+                        String strPoints = strPart.replace("tracePoints=", "");
+                        GetPoints(strPoints);
+                        return;
+                }
             }
-            m_listLatLon = nodelist;
         } catch (Exception e) {
-                m_listLatLon = new ArrayList<>();
+                //m_listLatLon = new ArrayList<>();
         }
     }
     
+    
+    /**
+     * Get points from string
+     */
+     public void GetPoints(String strResponse) {
+         try {
+             if (!strResponse.startsWith("(") || !strResponse.endsWith(")")){
+                return;
+             }
+             strResponse = strResponse.substring(1, strResponse.length()-1);
+             
+             ArrayList<LatLon> nodelist = new ArrayList<>();
+             
+             String[] astrPoints = strResponse.split("\\)\\(");
+             for (String strPoint : astrPoints) {
+                 String[] astrParts = strPoint.split(":");
+                 double x = Double.parseDouble(astrParts[0]);
+                 double y = Double.parseDouble(astrParts[1]);
+                 nodelist.add(new LatLon(x, y));
+             }
+             m_listLatLon = nodelist;
+         } catch (Exception e) {
+                //m_listLatLon = new ArrayList<>();
+         }
+     }
+    
 }