altoslib: Flush settings restoration commands after accel cal

[fw/altos] / altoslib / AltosMapInterface.java

diff --git a/altoslib/AltosMapInterface.java b/altoslib/AltosMapInterface.java
index 0dcd646e37428ea2f29f71b4a793f2a94b677d46..5089db646c6d70081ad3f638804e798bdd50fc2c 100644 (file)
--- a/altoslib/AltosMapInterface.java
+++ b/altoslib/AltosMapInterface.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,20 +16,21 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.net.*;
 
 public interface AltosMapInterface {
-       public abstract AltosMapPath path();
-       public abstract AltosMapLine line();
+       public abstract AltosMapPath new_path();
+
+       public abstract AltosMapLine new_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 AltosMapTile new_tile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size, int scale);
 
        public abstract int width();
 
@@ -36,9 +38,11 @@ public interface AltosMapInterface {
 
        public abstract void repaint();
 
-       public abstract void repaint(AltosMapRectangle damage, int pad);
+       public abstract void repaint(AltosRectangle damage);
+
+       public abstract void set_zoom_label(String label);
 
-       public abstract void repaint(double x, double y, double w, double h);
+       public abstract void debug(String format, Object ... arguments);
 
-       public abstract void set_units();
+       public abstract void select_object(AltosLatLon latlon);
 }