Changeset 31165 in osm for applications/editors/josm/plugins

Timestamp:

2015-05-31T17:30:53+02:00 (9 years ago)

Author:

nokutu

Message:

Change from org.json to javax.json

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads

Files:

• MapillarySequenceDownloadThread.java (modified) (4 diffs)
• MapillarySquareDownloadManagerThread.java (modified) (2 diffs)
• MapillarySquareDownloadThread.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java

@@ -6 +6 @@
 import java.io.InputStreamReader;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONArray;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.Json;
 
 import java.util.ArrayList;
@@ -46 +46 @@
                         br = new BufferedReader(new InputStreamReader(
                                         new URL(url).openStream()));
-                        String jsonLine = "";
-                        while (br.ready()) {
-                                jsonLine += br.readLine();
-                        }
-                        JSONObject jsonall = new JSONObject(jsonLine);
+                        /*
+                         * String jsonLine = ""; while (br.ready()) { jsonLine +=
+                         * br.readLine(); }
+                         */
+                        JsonObject jsonall = Json.createReader(br).readObject();
 
                         if (!jsonall.getBoolean("more") && !ex.isShutdown()) {
                                 ex.shutdownNow();
                         }
-                        JSONArray jsonseq = jsonall.getJSONArray("ss");
-                        for (int i = 0; i < jsonseq.length(); i++) {
-                                JSONObject jsonobj = jsonseq.getJSONObject(i);
-                                JSONArray cas = jsonobj.getJSONArray("cas");
-                                JSONArray coords = jsonobj.getJSONArray("coords");
-                                JSONArray keys = jsonobj.getJSONArray("keys");
+                        JsonArray jsonseq = jsonall.getJsonArray("ss");
+                        for (int i = 0; i < jsonseq.size(); i++) {
+                                JsonObject jsonobj = jsonseq.getJsonObject(i);
+                                JsonArray cas = jsonobj.getJsonArray("cas");
+                                JsonArray coords = jsonobj.getJsonArray("coords");
+                                JsonArray keys = jsonobj.getJsonArray("keys");
                                 ArrayList<MapillaryImage> images = new ArrayList<>();
-                                for (int j = 0; j < cas.length(); j++) {
+                                for (int j = 0; j < cas.size(); j++) {
                                         try {
-                                                images.add(new MapillaryImage(keys.getString(j), coords
-                                                                .getJSONArray(j).getDouble(1), coords
-                                                                .getJSONArray(j).getDouble(0), cas.getDouble(j)));
+                                                images.add(new MapillaryImage(keys.getString(j),
+                                                                coords.getJsonArray(j).getJsonNumber(1)
+                                                                                .doubleValue(), coords.getJsonArray(j)
+                                                                                .getJsonNumber(0).doubleValue(), cas
+                                                                                .getJsonNumber(j).doubleValue()));
                                         } catch (Exception e) {
                                                 // Mapillary service bug here
-                                                //System.out.println(cas.length());
-                                                //System.out.println(coords.length());
-                                                //System.out.println(keys.length());
+                                                // System.out.println(cas.length());
+                                                // System.out.println(coords.length());
+                                                // System.out.println(keys.length());
                                                 System.out.println(e);
                                         }
@@ -79 +81 @@
                                 int last = -1;
                                 int pos = 0;
-                                
+
                                 // Here it gets only those images which are in the downloaded
                                 // area.
@@ -104 +106 @@
                                 sequence.add(finalImages);
                         }
-                } catch (IOException | JSONException e) {
+                } catch (IOException e) {
                         return;
                 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java

@@ -2 +2 @@
 
 import java.util.concurrent.ThreadPoolExecutor;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -34 +33 @@
 
         public void run() {
-                /*
-                 * ThreadPoolExecutor ex = new ThreadPoolExecutor(30, 35, 25,
-                 * TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(20));
-                 * ArrayList<JSONArray> ret = new ArrayList<JSONArray>(); int page = 0;
-                 * while (!ex.isShutdown()) { ex.execute(new
-                 * MapillarySquareDownloadThread(ex, this.data, urlImages + "&page=" +
-                 * page + "&limit=25")); try { if (ex.getQueue().peek() != null)
-                 * Thread.sleep(1000); } catch(Exception e){ System.out.println(e); }
-                 * page++; }
-                 */
-                System.out.println(tr("INFORMATION: GET") + urlSequences);
                 fullfillSequences();
                 return;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadThread.java

@@ -5 +5 @@
 import java.io.InputStreamReader;
 
-import org.json.JSONObject;
-import org.json.JSONArray;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.Json;
 
 import java.util.ArrayList;
@@ -31 +32 @@
                         br = new BufferedReader(new InputStreamReader(
                                         new URL(url).openStream()));
-                        String jsonLine = "";
+                        /*String jsonLine = "";
                         while (br.ready()) {
                                 jsonLine += br.readLine();
-                        }
-                        JSONObject jsonobj = new JSONObject(jsonLine);
+                        }*/
+                        JsonObject jsonobj = Json.createReader(br).readObject();
                         if (!jsonobj.getBoolean("more")) {
                                 ex.shutdownNow();
                         }
-                        JSONArray jsonarr = jsonobj.getJSONArray("ims");
+                        JsonArray jsonarr = jsonobj.getJsonArray("ims");
                         ArrayList<MapillaryImage> images = new ArrayList<>();
-                        JSONObject image;
-                        for (int i = 0; i < jsonarr.length(); i++) {
+                        JsonObject image;
+                        for (int i = 0; i < jsonarr.size(); i++) {
                                 try {
-                                        image = jsonarr.getJSONObject(i);
+                                        image = jsonarr.getJsonObject(i);
                                         images.add(new MapillaryImage(image.getString("key"), image
-                                                        .getDouble("lat"), image.getDouble("lon"), image
-                                                        .getDouble("ca")));
+                                                        .getJsonNumber("lat")
+                                                        .doubleValue(), image.getJsonNumber("lon").doubleValue(), image
+                                                        .getJsonNumber("ca").doubleValue()));
                                 } catch (Exception e) {
                                         System.out.println(e);