Changeset 31306 in osm for applications/editors

Timestamp:

2015-06-24T22:29:34+02:00 (9 years ago)

Author:

nokutu

Message:

Solved cache infinite loop and added more signs to the filter

Location:

applications/editors/josm/plugins/mapillary

Files:

• images/intersection_danger.png (added)
• images/no_entry.png (added)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryMouseAdapter.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java (modified) (1 diff)

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

@@ -19 +19 @@
         super(lat, lon, ca);
         this.file = file;
-        System.out.println(datetimeOriginal);
         this.datetimeOriginal = getEpoch(datetimeOriginal, "yyyy/MM/dd hh:mm:ss");
     }

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

@@ -125 +125 @@
                         double dist = clickPoint.distanceSq(imagePoint);
                         if (minDistance > dist
-                                        && clickPoint.distance(imagePoint) < snapDistance) {
+                                        && clickPoint.distance(imagePoint) < snapDistance && image.isVisible()) {
                                 minDistance = dist;
                                 closest = image;
@@ -208 +208 @@
                         Main.map.mapMode.putValue("active", Boolean.FALSE);
                         imageHighlighted = true;
-                        System.out.println("1");
 
                 } else if (closestTemp == null
@@ -215 +214 @@
                         nothingHighlighted = false;
                         Main.map.mapMode.putValue("active", Boolean.TRUE);
-                        System.out.println("2");
 
                 } else if (imageHighlighted && !nothingHighlighted
@@ -221 +219 @@
                                 && Main.map.mapView.getEditLayer().data != null
                                 && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
-                        System.out.println("3");
 
                         for (OsmPrimitive primivitive : Main.map.mapView.getEditLayer().data
@@ -231 +228 @@
                 }
 
-                // TODO check if it is possible to do this while the OSM data layer is
-                // selected.
                 if (MapillaryData.getInstance().getHoveredImage() != closestTemp
                                 && closestTemp != null) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/cache/MapillaryCache.java

@@ -11 +11 @@
 
 public class MapillaryCache extends
-        JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> {
+                JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> {
 
-    private volatile URL url;
-    private volatile String key;
+        private volatile URL url;
+        private volatile String key;
 
-    public static enum Type {
-        FULL_IMAGE, THUMBNAIL
-    }
+        public static enum Type {
+                FULL_IMAGE, THUMBNAIL
+        }
 
-    public MapillaryCache(String key, Type type) {
-        super(MapillaryPlugin.CACHE, 50000, 50000,
-                new HashMap<String, String>());
-        this.key = key;
-        try {
-            if (type == Type.FULL_IMAGE) {
-                url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
-                        + "/thumb-2048.jpg");
-                this.key += ".FULL_IMAGE";
+        public MapillaryCache(String key, Type type) {
+                super(MapillaryPlugin.CACHE, 50000, 50000,
+                                new HashMap<String, String>());
+                this.key = key;
+                try {
+                        if (type == Type.FULL_IMAGE) {
+                                url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
+                                                + "/thumb-2048.jpg");
+                                this.key += ".FULL_IMAGE";
 
-            } else if (type == Type.THUMBNAIL) {
-                url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
-                        + "/thumb-320.jpg");
-                this.key += ".THUMBNAIL";
-            }
-        } catch (MalformedURLException e) {
-            Main.error(e);
-        }
-    }
+                        } else if (type == Type.THUMBNAIL) {
+                                url = new URL("https://d1cuyjsrcm0gby.cloudfront.net/" + key
+                                                + "/thumb-320.jpg");
+                                this.key += ".THUMBNAIL";
+                        }
+                } catch (MalformedURLException e) {
+                        Main.error(e);
+                }
+        }
 
-    @Override
-    public String getCacheKey() {
-        return key;
-    }
+        @Override
+        public String getCacheKey() {
+                return key;
+        }
 
-    @Override
-    public URL getUrl() {
-        return url;
-    }
+        @Override
+        public URL getUrl() {
+                return url;
+        }
 
-    @Override
-    protected BufferedImageCacheEntry createCacheEntry(byte[] content) {
-        return new BufferedImageCacheEntry(content);
-    }
+        @Override
+        protected BufferedImageCacheEntry createCacheEntry(byte[] content) {
+                return new BufferedImageCacheEntry(content);
+        }
 
-    @Override
-    protected boolean isObjectLoadable() {
-        if (cacheData == null)
-            return false;
-        byte[] content = cacheData.getContent();
-        return content != null && content.length > 0;
-    }
+        @Override
+        protected boolean isObjectLoadable() {
+                if (cacheData == null)
+                        return false;
+                byte[] content = cacheData.getContent();
+                return content != null && content.length > 0;
+        }
 
-    // @Override
-    protected boolean handleNotFound() {
-        return false;
-    }
+        // @Override
+        protected boolean handleNotFound() {
+                return false;
+        }
 }

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

@@ -50 +50 @@
 
         try {
-            Main.info("MapillaryPlugin GET " + url2);
+            Main.info("GET " + url2 + " (Mapillary plugin)");
             Main.worker.submit(new MapillarySquareDownloadManagerThread(url1,
                     url2, url3));

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
+import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
 
 /**
@@ -49 +50 @@
             Main.map.statusLine.setHelpText(tr("No images found"));
         MapillaryData.getInstance().dataUpdated();
+        MapillaryFilterDialog.getInstance().refresh();
     }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterChooseSigns.java

@@ -20 +20 @@
     public final JCheckBox roundabout = new JCheckBox();
     public final JCheckBox access = new JCheckBox();
+    public final JCheckBox intersection = new JCheckBox();
+    public final JCheckBox direction = new JCheckBox();
 
     private static MapillaryFilterChooseSigns INSTANCE;
@@ -29 +31 @@
         roundabout.setSelected(true);
         access.setSelected(true);
+        intersection.setSelected(true);
+        direction.setSelected(true);
 
         
@@ -73 +77 @@
         JLabel noEntryLabel = new JLabel(tr("No entry"));
         noEntryLabel.setIcon(new ImageProvider(
-                "styles/standard/vehicle/restriction/access.png").get());
+                "no_entry.png").get());
         noEntryPanel.add(noEntryLabel);
         noEntryPanel.add(access);
         this.add(noEntryPanel);
+        
+        // Danger intersection
+        JPanel intersectionPanel = new JPanel();
+        JLabel intersectionLabel = new JLabel(tr("Intersection danger"));
+        intersectionLabel.setIcon(new ImageProvider(
+                "intersection_danger.png").get());
+        intersectionPanel.add(intersectionLabel);
+        intersectionPanel.add(intersection);
+        this.add(intersectionPanel);
+        
+        // Mandatory direction
+        JPanel directionPanel = new JPanel();
+        JLabel directionLabel = new JLabel(tr("Mandatory direction (any)"));
+        directionLabel.setIcon(new ImageProvider(
+                "/home/nokutu/josm/core/images/styles/standard/vehicle/restriction/turn_restrictions/only_straight_on.png").get());
+        directionPanel.add(directionLabel);
+        directionPanel.add(direction);
+        this.add(directionPanel);
     }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java

@@ -51 +51 @@
 
         private final JCheckBox imported = new JCheckBox("Imported images");
-        private final JCheckBox downloaded = new JCheckBox(new downloadCheckBoxAction());
+        private final JCheckBox downloaded = new JCheckBox(
+                        new downloadCheckBoxAction());
         private final JCheckBox onlySigns = new JCheckBox(new OnlySignsAction());
         private final JComboBox<String> time;
@@ -62 +63 @@
         public final MapillaryFilterChooseSigns signFilter = MapillaryFilterChooseSigns
                         .getInstance();
+
+        private final String[] SIGN_TAGS = { "prohibitory_speed_limit",
+                        "priority_stop", "other_give_way", "mandatory_roundabout",
+                        "other_no_entry", "danger_intersection", "mandatory_go",
+                        "mandatory_keep" };
+        private final JCheckBox[] SIGN_CHECKBOXES = { signFilter.maxspeed,
+                        signFilter.stop, signFilter.giveWay, signFilter.roundabout,
+                        signFilter.access, signFilter.intersection, signFilter.direction,
+                        signFilter.direction };
 
         public MapillaryFilterDialog() {
@@ -70 +80 @@
                                                 Shortcut.NONE), 200);
 
- 
                 signChooser.setEnabled(false);
                 JPanel signChooserPanel = new JPanel();
@@ -188 +197 @@
 
         private boolean checkSigns(MapillaryImage img) {
-                // TODO move strings into an arraylist
-                if (checkSign(img, signFilter.maxspeed, "prohibitory_speed_limit"))
-                        return true;
-                
-                if (checkSign(img, signFilter.stop, "priority_stop"))
-                        return true;
-                
-                if (checkSign(img, signFilter.giveWay, "other_give_way"))
-                        return true;
-                
-                if (checkSign(img, signFilter.roundabout, "mandatory_roundabout"))
-                        return true;
-                
-                if (checkSign(img, signFilter.access, "other_no_entry"))
-                        return true;
-
+                for (int i = 0; i < SIGN_TAGS.length; i++) {
+                        if (checkSign(img, SIGN_CHECKBOXES[i], SIGN_TAGS[i]))
+                                return true;
+                }
                 return false;
         }
-        
-        private boolean checkSign(MapillaryImage img, JCheckBox signCheckBox, String singString) {
+
+        private boolean checkSign(MapillaryImage img, JCheckBox signCheckBox,
+                        String singString) {
                 boolean contains = false;
                 for (String sign : img.getSigns()) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java

@@ -298 +298 @@
          */
         @Override
-        public void loadingFinished(CacheEntry data,
-                        CacheEntryAttributes attributes, LoadResult result) {
+        public void loadingFinished(final CacheEntry data,
+                        final CacheEntryAttributes attributes, final LoadResult result) {
                 if (!SwingUtilities.isEventDispatchThread()) {
                         SwingUtilities.invokeLater(new Runnable() {
                                 @Override
                                 public void run() {
-                                        updateImage();
+                                        loadingFinished(data, attributes, result);
                                 }
                         });