Changeset 29381 in osm for applications

Timestamp:

2013-03-21T07:42:54+01:00 (12 years ago)

Author:

zverik

Message:

small refactoring of iodb

Location:

applications/editors/josm/plugins/imagery_offset_db/src/iodb

Files:

• DeprecateOffsetAction.java (modified) (1 diff)
• GetImageryOffsetAction.java (modified) (2 diffs)
• OffsetInfoAction.java (modified) (1 diff)
• QuerySuccessListener.java (modified) (1 diff)
• StoreImageryOffsetAction.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java

@@ -1 +1 @@
 package iodb;
 
-import iodb.QuerySuccessListener;
 import java.awt.event.ActionEvent;
 import java.io.UnsupportedEncodingException;

applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -73 +74 @@
             super(null, tr("Loading imagery offsets..."));
             try {
-                String query = "get?lat=" + center.lat() + "&lon=" + center.lon()
+                String query = "get?lat=" + center.latToString(CoordinateFormat.DECIMAL_DEGREES)
+                        + "&lon=" + center.lonToString(CoordinateFormat.DECIMAL_DEGREES)
                         + "&imagery=" + URLEncoder.encode(imagery, "UTF8");
                 int radius = Main.pref.getInteger("iodb.radius", -1);

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java

@@ -6 +6 @@
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.ImageProvider;

applications/editors/josm/plugins/imagery_offset_db/src/iodb/QuerySuccessListener.java

@@ -6 +6 @@
  * @author zverik
  */
-interface QuerySuccessListener {
+public interface QuerySuccessListener {
 
     /**

applications/editors/josm/plugins/imagery_offset_db/src/iodb/StoreImageryOffsetAction.java

@@ -28 +28 @@
 
     public void actionPerformed(ActionEvent e) {
-        if( Main.map == null || Main.map.mapView == null || getCurrentDataSet() == null )
+        if( Main.map == null || Main.map.mapView == null )
             return;
 
@@ -43 +43 @@
         // check if an object suitable for calibration is selected
         OsmPrimitive calibration = null;
-        Collection<OsmPrimitive> selectedObjects = getCurrentDataSet().getSelected();
-        if( selectedObjects.size() == 1 ) {
-            OsmPrimitive selection = selectedObjects.iterator().next();
-            if( (selection instanceof Node || selection instanceof Way) && !selection.isIncomplete() && !selection.isReferredByWays(1) ) {
-                String[] options = new String[] {tr("Store calibration geometry"), tr("Store imagery offset")};
-                int result = JOptionPane.showOptionDialog(Main.parent,
-                        tr("The selected object can be used as a calibration geometry. What do you intend to do?"),
-                        ImageryOffsetTools.DIALOG_TITLE, JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,
-                        null, options, options[0]);
-                if( result == 2 || result == JOptionPane.CLOSED_OPTION )
-                    return;
-                if( result == 0 )
-                    calibration = selection;
+        if( getCurrentDataSet() != null ) {
+            Collection<OsmPrimitive> selectedObjects = getCurrentDataSet().getSelected();
+            if( selectedObjects.size() == 1 ) {
+                OsmPrimitive selection = selectedObjects.iterator().next();
+                if( (selection instanceof Node || selection instanceof Way) && !selection.isIncomplete() && !selection.isReferredByWays(1) ) {
+                    String[] options = new String[] {tr("Store calibration geometry"), tr("Store imagery offset")};
+                    int result = JOptionPane.showOptionDialog(Main.parent,
+                            tr("The selected object can be used as a calibration geometry. What do you intend to do?"),
+                            ImageryOffsetTools.DIALOG_TITLE, JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,
+                            null, options, options[0]);
+                    if( result == 2 || result == JOptionPane.CLOSED_OPTION )
+                        return;
+                    if( result == 0 )
+                        calibration = selection;
+                }
             }
         }
@@ -132 +134 @@
         if( ImageryOffsetTools.getTopImageryLayer() == null )
             state = false;
-        if( getCurrentDataSet() == null )
-            state = false;
         setEnabled(state);
     }