Changeset 31259 in osm for applications/editors/josm/plugins/mapillary/src/org

Timestamp:

2015-06-11T15:26:31+02:00 (10 years ago)

Author:

nokutu

Message:

Now it downloads more data about the images and tells if there is a traffic signal in it

Location:

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

Files:

• MapillaryData.java (modified) (1 diff)
• MapillaryImage.java (modified) (4 diffs)
• MapillaryLayer.java (modified) (1 diff)
• MapillaryPlugin.java (modified) (1 diff)
• downloads/MapillaryDownloader.java (modified) (2 diffs)
• downloads/MapillaryImageInfoDownloaderThread.java (added)
• downloads/MapillarySignalDownloaderThread.java (added)
• downloads/MapillarySquareDownloadManagerThread.java (modified) (4 diffs)
• downloads/MapillarySquareDownloadThread.java (deleted)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java

@@ -156 +156 @@
         public void setSelectedImage(MapillaryAbstractImage image) {
                 selectedImage = image;
+                if (image instanceof MapillaryImage)
+                        System.out.println(((MapillaryImage) image).getLocation());
                 multiSelectedImages.clear();
                 multiSelectedImages.add(image);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -13 +16 @@
         /** Sequence of pictures containing this */
         private MapillarySequence sequence;
+
+        private int capturedAt;
+        private String user;
+        private List<String> signals;
+        private String location;
+
+        public String getLocation() {
+                return location;
+        }
+
+        public void setLocation(String location) {
+                this.location = location;
+        }
 
         /**
@@ -29 +45 @@
                 super(lat, lon, ca);
                 this.key = key;
+                this.signals = new ArrayList<>();
         }
 
@@ -38 +55 @@
         public String getKey() {
                 return this.key;
+        }
+        
+        public void addSignal(String signal) {
+                signals.add(signal);
+        }
+        
+        public List<String> getSignals() {
+                return signals;
+        }
+
+        public void setCapturedAt(int capturedAt) {
+                this.capturedAt = capturedAt;
+        }
+
+        public int getCapturedAt() {
+                return capturedAt;
+        }
+
+        public void setUser(String user) {
+                this.user = user;
+        }
+
+        public String getUser() {
+                return user;
         }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -246 +246 @@
                                         g.drawImage(op.filter(bi, null), p.x - (width / 2), p.y
                                                         - (height / 2), Main.map.mapView);
+                                        if (!image.getSignals().isEmpty()) {
+                                                g.drawImage(MapillaryPlugin.MAP_SIGNAL.getImage(), p.x
+                                                                + width / 2, p.y - height / 2,
+                                                                Main.map.mapView);
+                                        }
                                 } else if (imageAbs instanceof MapillaryImportedImage) {
                                         MapillaryImportedImage image = (MapillaryImportedImage) imageAbs;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -41 +41 @@
         public static final ImageIcon MAP_ICON_IMPORTED = new ImageProvider(
                         "mapiconimported.png").get();
+        public static final ImageIcon MAP_SIGNAL = new ImageProvider("signal.png")
+                        .get();
         public static final int ICON_SIZE = 24;
 

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

@@ -36 +36 @@
                 String url1 = BASE_URL;
                 String url2 = BASE_URL;
+                String url3 = BASE_URL;
                 url1 += "search/im/";
                 url2 += "search/s/";
+                url3 += "search/im/or";
                 ConcurrentHashMap<String, Double> hash = new ConcurrentHashMap<>();
                 hash.put("min_lat", minLatLon.lat());
@@ -45 +47 @@
                 url1 += buildParameters(hash);
                 url2 += buildParameters(hash);
+                url3 += buildParameters(hash);
+                
                 try {
                         Main.info("MapillaryPlugin GET " + url2);
-                        Main.worker.submit(new MapillarySquareDownloadManagerThread(url1, url2, new Bounds(minLatLon, maxLatLon)));
+                        Main.worker.submit(new MapillarySquareDownloadManagerThread(url1, url2, url3, new Bounds(minLatLon, maxLatLon)));
                 } catch (Exception e) {
                         Main.error(e);

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

@@ -22 +22 @@
 public class MapillarySquareDownloadManagerThread implements Runnable {
 
-        @SuppressWarnings("unused")
         private final String urlImages;
         private final String urlSequences;
+        private final String urlSignals;
         private final Bounds bounds;
 
         public MapillarySquareDownloadManagerThread(String urlImages,
-                        String urlSequences, Bounds bounds) {
+                        String urlSequences, String urlSignals, Bounds bounds) {
                 this.urlImages = urlImages;
                 this.urlSequences = urlSequences;
+                this.urlSignals = urlSignals;
                 this.bounds = bounds;
         }
@@ -38 +39 @@
                 try {
                         downloadSequences();
+                        completeImages();
+                        downloadSignals();
                 } catch (InterruptedException e) {
                         Main.error(e);
@@ -46 +49 @@
                 else
                         Main.map.statusLine.setHelpText(tr("No images found"));
+                MapillaryData.getInstance().dataUpdated();
         }
 
-        public void downloadSequences() throws InterruptedException {
+        private void downloadSequences() throws InterruptedException {
                 ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25,
                                 TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
@@ -62 +66 @@
                 MapillaryData.getInstance().dataUpdated();
         }
+
+        private void completeImages() throws InterruptedException {
+                ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25,
+                                TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+                int page = 0;
+                while (!ex.isShutdown()) {
+                        ex.execute(new MapillaryImageInfoDownloaderThread(ex, urlImages
+                                        + "&page=" + page + "&limit=20"));
+                        while (ex.getQueue().remainingCapacity() == 0)
+                                Thread.sleep(100);
+                        page++;
+                }
+                ex.awaitTermination(15, TimeUnit.SECONDS);
+        }
+
+        private void downloadSignals() throws InterruptedException {
+                ThreadPoolExecutor ex = new ThreadPoolExecutor(3, 5, 25,
+                                TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(5));
+                int page = 0;
+                while (!ex.isShutdown()) {
+                        ex.execute(new MapillarySignalDownloaderThread(ex, urlSignals
+                                        + "&page=" + page + "&limit=20"));
+                        while (ex.getQueue().remainingCapacity() == 0)
+                                Thread.sleep(100);
+                        page++;
+                }
+                ex.awaitTermination(15, TimeUnit.SECONDS);
+        }
 }