altoslib: Get new abstract mapping code compiling

[fw/altos] / altoslib / AltosMapInterface.java

diff --git a/altoslib/AltosMapInterface.java b/altoslib/AltosMapInterface.java
index ea5454de99757642d308bfa04b7890902bd432eb..c548744ba338105922c3f52e20d46066dc805461 100644 (file)
--- a/altoslib/AltosMapInterface.java
+++ b/altoslib/AltosMapInterface.java
@@ -20,16 +20,18 @@ package org.altusmetrum.altoslib_6;
 import java.io.*;
 import java.net.*;
 
-public abstract class AltosMapInterface {
-
-       public AltosMapPath             path;
-       public AltosMapLine             line;
+public interface AltosMapInterface {
+       public abstract AltosMapPath path();
+       public abstract AltosMapLine line();
 
        public abstract AltosImage load_image(File file) throws Exception;
 
        public abstract AltosMapMark new_mark(double lat, double lon, int state);
 
+       public abstract AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size);
+
        public abstract int width();
+
        public abstract int height();
 
        public abstract void repaint();
@@ -39,9 +41,4 @@ public abstract class AltosMapInterface {
        public abstract void repaint(double x, double y, double w, double h);
 
        public abstract void set_units();
-
-       public AltosMapInterface (AltosMapPath path, AltosMapLine line) {
-               this.path = path;
-               this.line = line;
-       }
 }