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

Timestamp:

2018-07-22T02:42:14+02:00 (7 years ago)

Author:

renerr18

Message:

Numerous changes based on post-release requests from client.

Location:

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

Files:

• StreetsideAbstractImage.java (modified) (1 diff)
• StreetsideLayer.java (modified) (1 diff)
• StreetsidePlugin.java (modified) (1 diff)
• cubemap/GraphicsUtils.java (modified) (1 diff)
• gui/StreetsideMainDialog.java (modified) (2 diffs)
• history/commands/CommandTurn.java (modified) (5 diffs)
• io/download/BoundsDownloadRunnable.java (modified) (1 diff)
• io/download/SequenceDownloadRunnable.java (modified) (9 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.streetside;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 
 /**

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

@@ -333 +333 @@
 
     // Paint direction indicator
+    float alpha = 0.75f;
+    int type = AlphaComposite.SRC_OVER;
+    AlphaComposite composite =
+      AlphaComposite.getInstance(type, alpha);
+    g.setComposite(composite);
     g.setColor(directionC);
     g.fillArc(p.x - CA_INDICATOR_RADIUS, p.y - CA_INDICATOR_RADIUS, 2 * CA_INDICATOR_RADIUS, 2 * CA_INDICATOR_RADIUS, (int) (90 - /*img.getMovingHe()*/img.getHe() - CA_INDICATOR_ANGLE / 2d), CA_INDICATOR_ANGLE);

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

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.ImageProvider;
-
-import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.StreetsideViewerPanel;
 
 /**

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtils.java

@@ -32 +32 @@
                 return wr;
         }
-
-        public static class PlatformHelper {
-
-        public static void run(Runnable treatment) {
-            if(treatment == null) throw new IllegalArgumentException("The treatment to perform can not be null");
-
-            if(Platform.isFxApplicationThread()) treatment.run();
-            else Platform.runLater(treatment);
-        }
-    }
 
         public static BufferedImage buildMultiTiledCubemapFaceImage(BufferedImage[] tiles) {

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideMainDialog.java

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -107 +108 @@
                 streetsideImageDisplay = new StreetsideImageDisplay();
 
+                blueButton.setForeground(Color.BLUE);
+    redButton.setForeground(Color.RED);
+
                 setMode(MODE.NORMAL);
         }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/history/commands/CommandTurn.java

@@ -16 +16 @@
  */
 public class CommandTurn extends StreetsideCommand {
-  private double ca;
+  private double he;
 
   /**
@@ -28 +28 @@
   public CommandTurn(Set<StreetsideAbstractImage> images, double ca) {
     super(images);
-    this.ca = ca;
+    he = ca;
   }
 
@@ -34 +34 @@
   public void undo() {
     for (StreetsideAbstractImage image : images) {
-      image.turn(-ca);
+      image.turn(-he);
       image.stopMoving();
     }
@@ -43 +43 @@
   public void redo() {
     for (StreetsideAbstractImage image : images) {
-      image.turn(ca);
+      image.turn(he);
       image.stopMoving();
     }
@@ -58 +58 @@
   public void sum(StreetsideCommand command) {
     if (command instanceof CommandTurn) {
-      ca += ((CommandTurn) command).ca;
+      he += ((CommandTurn) command).he;
     }
   }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java

@@ -33 +33 @@
     URL nextURL = getUrlGenerator().apply(bounds);
     if(StreetsideProperties.DEBUGING_ENABLED.get()) {
-      logger.debug(MessageFormat.format("nextURL: {0}", nextURL.toString()));
+      logger.debug(MessageFormat.format("Downloading bounds: URL: {0}", nextURL.toString()));
     }
     try {

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.streetside.StreetsideAbstractImage;
 import org.openstreetmap.josm.plugins.streetside.StreetsideData;
@@ -34 +35 @@
         private final StreetsideData data;
 
-  private static final Function<Bounds, URL> URL_GEN = APIv3::searchStreetsideSequences;
+  private static final Function<Bounds, URL> URL_GEN = APIv3::searchStreetsideImages;
 
   public SequenceDownloadRunnable(final StreetsideData data, final Bounds bounds) {
@@ -41 +42 @@
   }
 
+  // TODO: Revise sequence creation algorithm - compare bubble query results with bubbleId list
+  // and analyze discrepancies.
   @Override
   public void run(final URLConnection con) throws IOException {
@@ -59 +62 @@
 
     // Allow unrecognized properties - won't break with addition of new attributes
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
 
     try {
@@ -76 +79 @@
         // Discard the first sequence ('enabled') - it does not contain bubble data
         if (node.get("id") != null && node.get("la") != null && node.get("lo") != null) {
-          StreetsideImage image = new StreetsideImage(CubemapUtils.convertDecimal2Quaternary(node.path("id").asLong()), node.path("la").asDouble(), node.get("lo").asDouble());
+          StreetsideImage image = new StreetsideImage(CubemapUtils.convertDecimal2Quaternary(node.path("id").asLong()), new LatLon(node.path("la").asDouble(), node.get("lo").asDouble()), node.get("he").asDouble());
           if(previous!=null) {
             image.setPr(Long.parseLong(previous.getId()));
@@ -86 +89 @@
           image.setAl(node.path("al").asDouble());
           image.setBl(node.path("bl").asText());
-          image.setHe(node.path("he").asDouble());
           image.setMl(node.path("ml").asInt());
           image.setNbn(node.findValuesAsText("nbn"));
@@ -127 +129 @@
             StreetsideData.downloadSurroundingCubemaps(image);
           }
+        } else {
+          logger.info(MessageFormat.format("Unparsable JSON node object: {0}",node.toString()));
         }
       }
@@ -145 +149 @@
      *  unpredictably.
      **/
+    int x = bubbleImages.size();
     seq.add(bubbleImages);
 
@@ -166 +171 @@
 
     final long endTime = System.currentTimeMillis();
-    logger.info("Sucessfully loaded " + seq.getImages().size() + " Microsoft Streetside images in " + (endTime-startTime/1000));
+    logger.info(MessageFormat.format("Sucessfully loaded {0} Microsoft Streetside images in {1} seconds.", seq.getImages().size(),(endTime-startTime)/1000));
   }