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

Timestamp:

2015-08-06T16:55:05+02:00 (10 years ago)

Author:

nokutu

Message:

Moved bounds ArrayList from MapillaryLayer to MapillaryData.

Location:

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

Files:

• MapillaryData.java (modified) (2 diffs)
• MapillaryLayer.java (modified) (7 diffs)
• downloads/MapillaryDownloader.java (modified) (3 diffs)
• downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
@@ -26 +27 @@
 
   private CopyOnWriteArrayList<MapillaryDataListener> listeners = new CopyOnWriteArrayList<>();
+
+  /** The bounds of the areas for which the pictures have been downloaded. */
+  public CopyOnWriteArrayList<Bounds> bounds;
 
   /**

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

@@ -74 +74 @@
   public boolean TEMP_SEMIAUTOMATIC = false;
 
-  /** Unique instance of the class */
+  /** Unique instance of the class. */
   public static MapillaryLayer INSTANCE;
-  /** The image pointed by the blue line */
+  /** The image pointed by the blue line. */
   public static MapillaryImage BLUE;
-  /** The image pointed by the red line */
+  /** The image pointed by the red line. */
   public static MapillaryImage RED;
 
-  /** {@link MapillaryData} object that stores the database */
+  /** {@link MapillaryData} object that stores the database. */
   private final MapillaryData data;
 
-  /** The bounds of the areas for which the pictures have been downloaded */
-  public CopyOnWriteArrayList<Bounds> bounds;
-
-  /** Mode of the layer */
+  /** Mode of the layer. */
   public AbstractMode mode;
 
@@ -100 +97 @@
     super(tr("Mapillary Images"));
     this.data = new MapillaryData();
-    this.bounds = new CopyOnWriteArrayList<>();
+    this.data.bounds = new CopyOnWriteArrayList<>();
     init();
   }
@@ -243 +240 @@
    * Replies background color for downloaded areas.
    *
-   * @return background color for downloaded areas. Black by default
+   * @return background color for downloaded areas. Black by default.
    */
   private static Color getBackgroundColor() {
@@ -252 +249 @@
    * Replies background color for non-downloaded areas.
    *
-   * @return background color for non-downloaded areas. Yellow by default
+   * @return background color for non-downloaded areas. Yellow by default.
    */
   private static Color getOutsideColor() {
@@ -259 +256 @@
 
   /**
-   * Initialize the hatch pattern used to paint the non-downloaded area
+   * Initialize the hatch pattern used to paint the non-downloaded area.
    */
   private void createHatchTexture() {
@@ -283 +280 @@
       Area a = new Area(b);
       // now successively subtract downloaded areas
-      for (Bounds bounds : this.bounds) {
+      for (Bounds bounds : this.data.bounds) {
         Point p1 = mv.getPoint(bounds.getMin());
         Point p2 = mv.getPoint(bounds.getMax());
@@ -508 +505 @@
   }
 
-  // EditDataLayerChanged
   @Override
   public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {

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

@@ -82 +82 @@
     if (isViewDownloaded(view))
       return;
-    MapillaryLayer.getInstance().bounds.add(view);
+    MapillaryLayer.getInstance().getData().bounds.add(view);
     getImages(view);
   }
@@ -108 +108 @@
   }
 
+  /**
+   * Checks if the given {@LatLon} object lies inside the bounds of the
+   * image.
+   *
+   * @param latlon
+   * @return true if it lies inside the bounds; false otherwise;
+   */
   private static boolean isInBounds(LatLon latlon) {
-    for (Bounds bounds : MapillaryLayer.getInstance().bounds) {
+    for (Bounds bounds : MapillaryLayer.getInstance().getData().bounds) {
       if (bounds.contains(latlon))
         return true;
@@ -141 +148 @@
     for (Bounds bounds : Main.map.mapView.getEditLayer().data
         .getDataSourceBounds()) {
-      if (!layer.bounds.contains(bounds)) {
-        layer.bounds.add(bounds);
+      if (!layer.getData().bounds.contains(bounds)) {
+        layer.getData().bounds.add(bounds);
         MapillaryDownloader.getImages(bounds.getMin(), bounds.getMax());
       }

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

@@ -132 +132 @@
 
   private boolean isInside(MapillaryAbstractImage image) {
-    for (int i = 0; i < this.layer.bounds.size(); i++)
-      if (this.layer.bounds.get(i).contains(image.getLatLon()))
+    for (int i = 0; i < this.layer.getData().bounds.size(); i++)
+      if (this.layer.getData().bounds.get(i).contains(image.getLatLon()))
         return true;
     return false;