Changeset 29380 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

Timestamp:

2013-03-21T07:28:34+01:00 (13 years ago)

Author:

zverik

Message:

updated alpha of iodb

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java (modified) (2 diffs)

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

@@ -61 +61 @@
             return;
         }
-        final ImageryOffsetBase offset = new OffsetDialog(offsets).showDialog();
-        if( offset != null ) {
-            if( offset instanceof ImageryOffset ) {
-                ImageryOffsetTools.applyLayerOffset(layer, (ImageryOffset)offset);
-                Main.map.repaint();
-            } else if( offset instanceof CalibrationObject ) {
-                CalibrationLayer clayer = new CalibrationLayer((CalibrationObject)offset);
-                Main.map.mapView.addLayer(clayer);
-                clayer.panToCenter();
-                if( !Main.pref.getBoolean("iodb.calibration.message", false) ) {
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("A layer has been added with a calibration geometry. Hide data layers,\n"
-                            + "find the corresponding feature on the imagery layer and move it accordingly."),
-                            ImageryOffsetTools.DIALOG_TITLE, JOptionPane.INFORMATION_MESSAGE);
-                    Main.pref.put("iodb.calibration.message", true);
-                }
-            }
-        }
+        OffsetDialog offsetDialog = new OffsetDialog(offsets);
+        if( offsetDialog.showDialog() != null )
+            offsetDialog.applyOffset();
     }
 
@@ -92 +77 @@
                 int radius = Main.pref.getInteger("iodb.radius", -1);
                 if( radius > 0 )
-                    query = query + "?radius=" + radius;
+                    query = query + "&radius=" + radius;
                 setQuery(query);
             } catch( UnsupportedEncodingException e ) {