Changeset 31196 in osm for applications

Timestamp:

2015-06-03T13:19:13+02:00 (10 years ago)

Author:

nokutu

Message:

Solved but when exporting sequences

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/build.xml

@@ -16 +16 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7777"/>
-    <property name="plugin.version" value="0.8"/>
+    <property name="plugin.version" value="0.8.1"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -5 +5 @@
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
 import java.util.List;
 
@@ -46 +47 @@
                                 export(MapillaryData.getInstance().getImages());
                         } else if (dialog.group.isSelected(dialog.sequence.getModel())) {
-                                export(MapillaryData.getInstance().getSelectedImage()
-                                                .getSequence().getImages());
+                                ArrayList<MapillaryImage> images = new ArrayList<>();
+                                for (MapillaryImage image : MapillaryData.getInstance().getMultiSelectedImages())
+                                        if (!images.contains(image))
+                                                images.addAll(image.getSequence().getImages());
+                                export(images);
                         } else if (dialog.group.isSelected(dialog.selected.getModel())) {
                                 export(MapillaryData.getInstance().getMultiSelectedImages());

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

@@ -44 +44 @@
         public MapillaryPlugin(PluginInformation info) {
                 super(info);
-                synchronized (this) {
-                        Main.logLevel = 1;
-                }
                 downloadAction = new MapillaryDownloadAction();
                 exportAction = new MapillaryExportAction();

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

@@ -13 +13 @@
 public class MapillarySequence {
         private final List<MapillaryImage> images;
-        private String timestamp;
         private final String key;
+        private final int created_at;
 
-        public MapillarySequence(String key) {
+        public MapillarySequence(String key, int created_at) {
                 this.images = new ArrayList<>();
                 this.key = key;
+                this.created_at = created_at;
         }
 
@@ -31 +32 @@
         }
         
-        public void setTimestamp(String timestamp) {
-                this.timestamp = timestamp;
-        }
-        
-        public String getTimestamp() {
-                return this.timestamp;
+
+        public int getCreatedAt() {
+                return created_at;
         }
 

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

@@ -69 +69 @@
                                                                                 .getJsonNumber(j).doubleValue()));
                                         } catch (IndexOutOfBoundsException e) {
-                                                Main.error(e);
+                                                Main.warn("Mapillary bug at " + url);
                                                 isSequenceWrong = true;
                                         } catch (Exception e) {
@@ -77 +77 @@
                                 if (isSequenceWrong)
                                         break;
-                                MapillarySequence sequence = new MapillarySequence(jsonobj.getString("key"));
+                                MapillarySequence sequence = new MapillarySequence(jsonobj.getString("key"), jsonobj.getJsonNumber("captured_at").intValue());
                                 for (MapillaryImage mimage : MapillaryData.getInstance().getImages())
                                         if (mimage.getSequence().getKey() == sequence.getKey())