altoslib: Get new abstract mapping code compiling

[fw/altos] / altoslib / AltosMapLine.java

diff --git a/altoslib/AltosMapLine.java b/altoslib/AltosMapLine.java
index 83de47f9c2c460973293c129ded5d781fc0ba52e..77807b9403f9de3b4c0f48c9d2fb7315e0e0c5a4 100644 (file)
--- a/altoslib/AltosMapLine.java
+++ b/altoslib/AltosMapLine.java
@@ -23,26 +23,28 @@ import java.util.*;
 import java.util.concurrent.*;
 
 public abstract class AltosMapLine implements AltosFontListener {
 import java.util.concurrent.*;
 
 public abstract class AltosMapLine implements AltosFontListener {

-       AltosLatLon     start, end;
+       public AltosLatLon      start, end;

 
        static public int stroke_width = 6;
 
        public abstract void font_size_changed(int font_size);
 
 
        static public int stroke_width = 6;
 
        public abstract void font_size_changed(int font_size);
 

-       private AltosLatLon lat_lon(AltosPointDouble pt, AltosMapTransform t) {
+       public abstract void paint(AltosMapTransform t);
+
+       private AltosLatLon lat_lon(AltosPointInt pt, AltosMapTransform t) {

                return t.screen_lat_lon(pt);
        }
 
                return t.screen_lat_lon(pt);
        }
 

-       public void dragged(AltosPointDouble pt, AltosMapTransform t) {
+       public void dragged(AltosPointInt pt, AltosMapTransform t) {

                end = lat_lon(pt, t);
        }
 
                end = lat_lon(pt, t);
        }
 

-       public void pressed(AltosPointDouble pt, AltosMapTransform t) {
+       public void pressed(AltosPointInt pt, AltosMapTransform t) {

                start = lat_lon(pt, t);
                end = null;
        }
 
                start = lat_lon(pt, t);
                end = null;
        }
 

-       private String line_dist() {
+       public String line_dist() {

                String  format;
                AltosGreatCircle        g = new AltosGreatCircle(start.lat, start.lon,
                                                                 end.lat, end.lon);
                String  format;
                AltosGreatCircle        g = new AltosGreatCircle(start.lat, start.lon,
                                                                 end.lat, end.lon);


@@ -78,6 +80,4 @@ public abstract class AltosMapLine implements AltosFontListener {
                }
                return String.format(format, distance);
        }
                }
                return String.format(format, distance);
        }

-
-       public abstract void paint(AltosMapTransform t);

 }
 }