Changeset 34431 in osm for applications/editors/josm/plugins/MicrosoftStreetside/src

Timestamp:

2018-07-22T02:40:13+02:00 (6 years ago)

Author:

renerr18

Message:

Added GraphicsUtils - had been moved but was unversioned.

Location:

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils

Files:

• GraphicsUtils.java (added)
• StreetsideProperties.java (modified) (2 diffs)
• StreetsideURL.java (modified) (2 diffs)
• StreetsideUtils.java (modified) (4 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideProperties.java

@@ -24 +24 @@
   public static final IntegerProperty TILE_DOWNLOAD_THREAD_PAUSE_LEN_SEC = new IntegerProperty("streetside.tile-download-thread-pause-len-sec", 60);
   public static final BooleanProperty PREDOWNLOAD_CUBEMAPS = new BooleanProperty("streetside.predownload-cubemaps", false);
-  public static final BooleanProperty DEBUGING_ENABLED = new BooleanProperty("streetside.debugging-enabled", true);
+  public static final BooleanProperty DEBUGING_ENABLED = new BooleanProperty("streetside.debugging-enabled", false);
   public static final BooleanProperty DOWNLOAD_CUBEFACE_TILES_TOGETHER = new BooleanProperty("streetside.download-cubeface-tiles-together", false);
 
@@ -61 +61 @@
     new StringProperty("streetside.start-directory", System.getProperty("user.home"));
   public static final StringProperty URL_CLIENT_ID =
-    new StringProperty("streetside.url-clientid", System.getProperty("T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz"));
+    new StringProperty("streetside.url-clientid", "T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz");
   public static final StringProperty BING_MAPS_KEY =
-    new StringProperty("streetside.bing-maps-key", System.getProperty("AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm"));
+    new StringProperty("streetside.bing-maps-key", "AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm");
   public static final StringProperty TEST_BUBBLE_ID =
-    new StringProperty("streetside.test-bubble-id", System.getProperty("80848005"));
+    new StringProperty("streetside.test-bubble-id", "80848005");
 
   /**

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java

@@ -43 +43 @@
 
                 public static URL searchStreetsideImages(Bounds bounds) {
-                        return StreetsideURL.string2URL(StreetsideURL.STREETSIDE_BASE_URL, APIv3.queryStreetsideString(bounds));
-                }
-
-                public static URL searchStreetsideSequences(final Bounds bounds) {
                         return StreetsideURL.string2URL(StreetsideURL.STREETSIDE_BASE_URL, APIv3.queryStreetsideString(bounds));
                 }
@@ -299 +295 @@
                 }
 
-                if(StreetsideProperties.DEBUGING_ENABLED.get()) {
-                  logger.debug(MessageFormat.format("queryStreetsideBoundsString result: {0}", ret.toString()));
-                }
-
                 return ret.toString();
         }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideUtils.java

@@ -8 +8 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -19 +16 @@
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -33 +31 @@
  */
 public final class StreetsideUtils {
+
+  final static Logger logger = Logger.getLogger(StreetsideUtils.class);
 
   private static final double MIN_ZOOM_SQUARE_SIDE = 0.002;
@@ -285 +285 @@
     MainApplication.getMap().statusLine.setHelpText(ret.toString());
   }
-
-  public static List<StreetsideAbstractImage> sortImagesInSequence(List<StreetsideAbstractImage> images) {
-    List<StreetsideAbstractImage> res = new ArrayList<StreetsideAbstractImage>();
-    if (images != null && images.size() > 0) {
-      res.add(images.get(0));
-      try {
-      images.remove(0);
-      String nextImageId = Long.toString(images.get(0).getNe());
-      if (nextImageId != null) {
-        Iterator<StreetsideAbstractImage> iter = images.iterator();
-        while (iter.hasNext()) {
-          StreetsideAbstractImage current = (StreetsideAbstractImage) iter.next();
-          if (nextImageId.equals(current.getId())) {
-            res.add(current);
-            images.remove(current);
-          }
-        }
-      }
-      } catch (java.lang.UnsupportedOperationException uoe) {
-        // ignore
-      }
-    }
-
-    return res;
-  }
 }