Changeset 28008 in osm for applications

Timestamp:

2012-03-06T21:32:44+01:00 (12 years ago)

Author:

zverik

Message:

Something works :)

Location:

applications/editors/josm/plugins/imagery_offset_db

Files:

• data (added)
• images/getoffset.png (added)
• images/storeoffset.png (added)
• src/iodb/CalibrationObject.java (modified) (3 diffs)
• src/iodb/GetImageryOffsetAction.java (modified) (6 diffs)
• src/iodb/ImageryOffset.java (modified) (3 diffs)
• src/iodb/ImageryOffsetBase.java (modified) (2 diffs)
• src/iodb/ImageryOffsetTools.java (added)
• src/iodb/OffsetDialog.java (modified) (3 diffs)
• src/iodb/OffsetDialogButton.java (modified) (1 diff)
• src/iodb/StoreImageryOffsetAction.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package iodb;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.User;
+import java.util.Map;
+import org.openstreetmap.josm.data.osm.*;
 
 /**
@@ -18 +18 @@
 
     public CalibrationObject(OsmPrimitive object) {
-        this(object, -1);
+        this(object, getLastUserId(object));
     }
 
@@ -28 +28 @@
         return object;
     }
+    
+    private static long getLastUserId( OsmPrimitive object ) {
+        return object.getUser() == null ? -1 : object.getUser().getId(); // todo?
+    }
+
+    @Override
+    public void putServerParams( Map<String, String> map ) {
+        super.putServerParams(map);
+        map.put("object", object instanceof Node ? "node" : "way");
+        map.put("id", String.valueOf(object.getId()));
+        map.put("lastuser", String.valueOf(lastUserId));
+    }
+    
 }

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

@@ -37 +37 @@
     private List<ImageryOffsetBase> offsets;
     
-    private HashMap<String, String> imageryAliases;
-    
     public GetImageryOffsetAction() {
         super(tr("Get Imagery Offset..."), "getoffset", tr("Download offsets for current imagery from a server"),
@@ -48 +46 @@
         Projection proj = Main.map.mapView.getProjection();
         LatLon center = proj.eastNorth2latlon(Main.map.mapView.getCenter());
-        // todo: download a list of offsets for current bbox * N
-        List<ImageryOffsetBase> offsets = download(center); // todo: async
-        DownloadOffsets download = new DownloadOffsets();
+        ImageryLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        String imagery = ImageryOffsetTools.getImageryID(layer);
+        if( imagery == null )
+            return;
+        
+        List<ImageryOffsetBase> offsets = download(center, imagery); // todo: async
+        /*DownloadOffsets download = new DownloadOffsets();
         Future<?> future = Main.worker.submit(download);
         try {
@@ -57 +59 @@
             ex.printStackTrace();
             return;
-        }
+        }*/
         
         // todo: show a dialog for selecting one of the offsets (without "update" flag)
@@ -63 +65 @@
         if( offset != null ) {
             // todo: use the chosen offset
+            if( offset instanceof ImageryOffset ) {
+                ImageryOffsetTools.applyLayerOffset(layer, (ImageryOffset)offset);
+            } else if( offset instanceof CalibrationObject ) {
+                // todo: select object
+            }
         }
     }
     
-    private List<ImageryOffsetBase> download( LatLon center ) {
-        String base = Main.pref.get("iodb.server.url", "http://textual.ru/iodb.php");
-        String query = "?action=get&lat=" + center.getX() + "&lon=" + center.getY();
+    private List<ImageryOffsetBase> download( LatLon center, String imagery ) {
+        String base = Main.pref.get("iodb.server.url", "http://offsets.textual.ru/");
+        String query = "get?lat=" + center.getX() + "&lon=" + center.getY();
         List<ImageryOffsetBase> result = null;
         try {
-            query = query + "&imagery=" + URLEncoder.encode(getImageryID(), "utf-8");
+            query = query + "&imagery=" + URLEncoder.encode(imagery, "utf-8");
             URL url = new URL(base + query);
+            System.out.println("url=" + url);
             HttpURLConnection connection = (HttpURLConnection)url.openConnection();
             connection.connect();
@@ -79 +87 @@
             if( inp != null ) {
                 result = new IODBReader(inp).parse();
+                System.out.println("result.size() = " + result.size());
             }
             connection.disconnect();
@@ -95 +104 @@
             result = new ArrayList<ImageryOffsetBase>();
         return result;
-    }
-    
-    private String getImageryID() {
-        List<ImageryLayer> layers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
-        String url = null;
-        for( ImageryLayer layer : layers ) {
-            if( layer.isVisible() ) {
-                url = layer.getInfo().getUrl();
-                break;
-            }
-        }
-        if( url == null )
-            return null;
-        
-        if( imageryAliases == null )
-            loadImageryAliases();
-        for( String substr : imageryAliases.keySet() )
-            if( url.contains(substr) )
-                return imageryAliases.get(substr);
-        
-        return url; // todo: strip parametric parts, etc
-    }
-    
-    private void loadImageryAliases() {
-        if( imageryAliases == null )
-            imageryAliases = new HashMap<String, String>();
-        else
-            imageryAliases.clear();
-        
-        // { substring, alias }
-        imageryAliases.put("bing", "bing");
-        // todo: load from a resource?
-    }
-    
-    // Following three methods were snatched from TMSLayer
-    private double latToTileY(double lat, int zoom) {
-        double l = lat / 180 * Math.PI;
-        double pf = Math.log(Math.tan(l) + (1 / Math.cos(l)));
-        return Math.pow(2.0, zoom - 1) * (Math.PI - pf) / Math.PI;
-    }
-
-    private double lonToTileX(double lon, int zoom) {
-        return Math.pow(2.0, zoom - 3) * (lon + 180.0) / 45.0;
-    }
-
-    private int getCurrentZoom() {
-        if (Main.map == null || Main.map.mapView == null) {
-            return 1;
-        }
-        MapView mv = Main.map.mapView;
-        LatLon topLeft = mv.getLatLon(0, 0);
-        LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
-        double x1 = lonToTileX(topLeft.lon(), 1);
-        double y1 = latToTileY(topLeft.lat(), 1);
-        double x2 = lonToTileX(botRight.lon(), 1);
-        double y2 = latToTileY(botRight.lat(), 1);
-
-        int screenPixels = mv.getWidth() * mv.getHeight();
-        double tilePixels = Math.abs((y2 - y1) * (x2 - x1) * 256 * 256);
-        if (screenPixels == 0 || tilePixels == 0) {
-            return 1;
-        }
-        double factor = screenPixels / tilePixels;
-        double result = Math.log(factor) / Math.log(2) / 2 + 1;
-        int intResult = (int) Math.floor(result);
-        return intResult;
     }
     

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

@@ -1 +1 @@
 package iodb;
 
+import java.util.Map;
+import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
 
@@ -19 +21 @@
         this.maxZoom = 30;
     }
-
+    
     public void setMaxZoom(int maxZoom) {
         this.maxZoom = maxZoom;
@@ -43 +45 @@
         return minZoom;
     }
+
+    @Override
+    public void putServerParams( Map<String, String> map ) {
+        super.putServerParams(map);
+        map.put("imagery", imagery);
+        map.put("imlat", imageryPos.latToString(CoordinateFormat.DECIMAL_DEGREES));
+        map.put("imlon", imageryPos.lonToString(CoordinateFormat.DECIMAL_DEGREES));
+        if( minZoom > 0 )
+            map.put("minzoom", String.valueOf(minZoom));
+        if( maxZoom < 30 )
+            map.put("maxzoom", String.valueOf(maxZoom));
+    }
 }

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

@@ -2 +2 @@
 
 import java.util.Date;
+import java.util.Map;
+import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
 
@@ -51 +53 @@
         return position;
     }
+    
+    public void putServerParams( Map<String, String> map ) {
+        map.put("lat", position.latToString(CoordinateFormat.DECIMAL_DEGREES));
+        map.put("lon", position.lonToString(CoordinateFormat.DECIMAL_DEGREES));
+        map.put("author", author);
+        map.put("description", description);
+    }
 }

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

@@ -14 +14 @@
  * @author zverik
  */
-public class OffsetDialog extends JDialog {
+public class OffsetDialog extends JDialog implements ActionListener {
     private List<ImageryOffsetBase> offsets;
-    private int selectedOffset;
+    private ImageryOffsetBase selectedOffset;
 
     public OffsetDialog( List<ImageryOffsetBase> offsets ) {
@@ -27 +27 @@
         JPanel buttonPanel = new JPanel(new GridLayout(offsets.size() + 1, 1));
         for( ImageryOffsetBase offset : offsets ) {
-            buttonPanel.add(new OffsetDialogButton(offset));
+            OffsetDialogButton button = new OffsetDialogButton(offset);
+            button.addActionListener(this);
+            buttonPanel.add(button);
         }
         JButton cancelButton = new JButton("Cancel");
-        cancelButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                selectedOffset = -1;
-                OffsetDialog.this.setVisible(false);
-            }
-        });
+        cancelButton.addActionListener(this);
         buttonPanel.add(cancelButton); // todo: proper button
         setContentPane(buttonPanel);
@@ -43 +40 @@
     
     public ImageryOffsetBase showDialog() {
-        selectedOffset = -1;
+        selectedOffset = null;
         prepareDialog();
         setVisible(true);
-        return selectedOffset < 0 ? null : offsets.get(selectedOffset);
+        return selectedOffset;
+    }
+
+    public void actionPerformed( ActionEvent e ) {
+        if( e.getSource() instanceof OffsetDialogButton ) {
+            selectedOffset = ((OffsetDialogButton)e.getSource()).getOffset();
+        } else
+            selectedOffset = null;
+        setVisible(false);
     }
 }

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

@@ -9 +9 @@
  */
 public class OffsetDialogButton extends JButton {
+    
+    private ImageryOffsetBase offset;
 
     public OffsetDialogButton( ImageryOffsetBase offset ) {
         super(offset.getDescription() + " (" + offset.getPosition().lat() + ", " + offset.getPosition().lon() + ")");
+        this.offset = offset;
+    }
+
+    public ImageryOffsetBase getOffset() {
+        return offset;
     }
     

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

@@ -2 +2 @@
 
 import java.awt.event.ActionEvent;
+import java.util.HashMap;
+import java.util.Map;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -20 +22 @@
 
     public void actionPerformed(ActionEvent e) {
+        // todo: check that there is an imagery
+        // and that it is moved
         Projection proj = Main.map.mapView.getProjection();
         LatLon center = proj.eastNorth2latlon(Main.map.mapView.getCenter());
@@ -27 +31 @@
         // todo: upload object info to server
     }
+    
+    private static void upload( ImageryOffsetBase offset ) {
+        String base = Main.pref.get("iodb.server.url", "http://offsets.textual.ru/");
+        Map<String, String> params = new HashMap<String, String>();
+        offset.putServerParams(params);
+        // todo
+    }
 }