X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosSiteMap.java;h=df1cc246a9948b071e814115471264e49be90ee0;hp=25b7779243f4fda1bea9b4be51a2e0380e11007f;hb=483346a03c94b200692f5e6d59f3feee4dcf2ace;hpb=939be6793238a275b7682ecc376fed14379cf044

diff --git a/ao-tools/altosui/AltosSiteMap.java b/ao-tools/altosui/AltosSiteMap.java
index 25b77792..df1cc246 100644
--- a/ao-tools/altosui/AltosSiteMap.java
+++ b/ao-tools/altosui/AltosSiteMap.java
@@ -32,146 +32,32 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;
 
 public class AltosSiteMap extends JComponent implements AltosFlightDisplay {
-    double lat, lng;
-    int zoom;
-    double scale_x, scale_y;
-    Point2D.Double coord_pt;
-    Point2D.Double last_pt;
-
-    Graphics2D g2d;
-
-    private boolean setLocation(double new_lat, double new_lng) {
-        int new_zoom = 15;
-        lat = new_lat;
-        lng = new_lng;
-        zoom = new_zoom;
-        scale_x = 256/360.0 * Math.pow(2, zoom);
-        scale_y = 256/(2.0*Math.PI) * Math.pow(2, zoom);
-        coord_pt = pt(lat, lng, new Point2D.Double(0,0));
-        coord_pt.x = 320-coord_pt.x;
-        coord_pt.y = 320-coord_pt.y;
-        last_pt = null;
-
-        try {
-            File pngfile = new File(AltosPreferences.logdir(), 
-                                    FileCoord(lat, lng, zoom));
-            System.out.printf("Trying file %s\n", pngfile);
-            BufferedImage myPicture = ImageIO.read(pngfile);
-            picLabel.setIcon(new ImageIcon( myPicture ));
-            g2d = myPicture.createGraphics();
-        } catch (Exception e) { 
-            // throw new RuntimeException(e);
-            return false;
-        }
-        return true;
-    }
-
-    private static double limit(double v, double lo, double hi) {
-        if (v < lo)
-            return lo;
-        if (hi < v)
-            return hi;
-        return v;
-    }
-
-    private static String FileCoord(double lat, double lng, int zoom) {
-        char chlat = lat < 0 ? 'S' : 'N';
-        char chlng = lng < 0 ? 'E' : 'W';
-        if (lat < 0) lat = -lat;
-        if (lng < 0) lng = -lng;
-        return String.format("map-%c%.3f,%c%.3f-%d.png",
-                chlat, lat, chlng, lng, zoom);
-    }
-
-
-    // based on google js
-    //  http://maps.gstatic.com/intl/en_us/mapfiles/api-3/2/10/main.js
-    // search for fromLatLngToPoint and fromPointToLatLng
-    private Point2D.Double pt(double lat, double lng) {
-        return pt(lat, lng, coord_pt);
-    }
-
-    private Point2D.Double pt(double lat, double lng, Point2D.Double centre) {
-        Point2D.Double res = new Point2D.Double();
-        double e;
-
-        res.x = centre.x + lng*scale_x;
-        e = limit(Math.sin(Math.toRadians(lat)),-(1-1.0E-15),1-1.0E-15);
-        res.y = centre.y + 0.5*Math.log((1+e)/(1-e))*-scale_y;
-        return res;
-    }
-
-
     public void reset() {
-        // ?
+        // nothing
     }
-
-    static Color stateColors[] = {
-        Color.WHITE,  // startup
-        Color.WHITE,  // idle
-        Color.WHITE,  // pad
-        Color.RED,    // boost
-        Color.PINK,   // fast
-        Color.YELLOW, // coast
-        Color.CYAN,   // drogue
-        Color.BLUE,   // main
-        Color.BLACK   // landed
-    };
-
-    boolean drawn_landed_circle = false;
-    boolean nomaps = false;
     public void show(AltosState state, int crc_errors) {
-        if (nomaps)
-            return;
-        if (!state.gps_ready && state.pad_lat == 0 && state.pad_lon == 0)
-            return;
-        double plat = (int)(state.pad_lat*200)/200.0;
-        double plon = (int)(state.pad_lon*200)/200.0;
-
-        if (last_pt == null) {
-            if (!setLocation(plat, plon)) {
-                nomaps = true;
-                return;
-            }
-        }
-
-        Point2D.Double pt = pt(state.gps.lat, state.gps.lon);
-        if (last_pt != null && pt != last_pt) {
-            if (0 <= state.state && state.state < stateColors.length) {
-                g2d.setColor(stateColors[state.state]);
-            }
-            g2d.draw(new Line2D.Double(last_pt, pt));
-        }
-
-        if (state.state == 8 && !drawn_landed_circle) {
-            drawn_landed_circle = true;
-            g2d.setColor(Color.RED);
-            g2d.drawOval((int)pt.x-5, (int)pt.y-5, 10, 10);
-            g2d.drawOval((int)pt.x-20, (int)pt.y-20, 40, 40);
-            g2d.drawOval((int)pt.x-35, (int)pt.y-35, 70, 70);
+        for (int x = 0; x < mapTiles.length; x++) {
+            mapTiles[x].show(state, crc_errors);
         }
-
-        last_pt = pt;
-        repaint();
     }
-   
-    JLabel picLabel = new JLabel();
+  
+    AltosSiteMapTile [] mapTiles = new AltosSiteMapTile[9];
 
     public AltosSiteMap() {
+
         GridBagLayout layout = new GridBagLayout();
         setLayout(layout);
 
         GridBagConstraints c = new GridBagConstraints();
-
-        c.gridx = 0; c.gridy = 0;
-        c.weightx = 1; c.weighty = 1;
         c.anchor = GridBagConstraints.CENTER;
         c.fill = GridBagConstraints.BOTH;
-        picLabel = new JLabel();
-        JScrollPane scrollPane = new JScrollPane(picLabel);
-        layout.setConstraints(scrollPane, c);
-        add(scrollPane);
 
+        for (int x = 0; x < 9; x++) {
+            c.gridx = x % 3; c.gridy = x / 3;
+            mapTiles[x] = new AltosSiteMapTile((x%3)-1, (x/3)-1);
+            layout.setConstraints(mapTiles[x], c);
+            add(mapTiles[x]);
+        }
     }
 }