*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_11;
import java.io.*;
import java.lang.*;
import java.util.*;
import java.util.concurrent.*;
-public class AltosMap implements AltosFlightDisplay, AltosMapTileListener, AltosMapStoreListener {
+public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
- static final int px_size = 512;
+ public static final int px_size = 512;
- static final int maptype_hybrid = 0;
- static final int maptype_roadmap = 1;
- static final int maptype_satellite = 2;
- static final int maptype_terrain = 3;
- static final int maptype_default = maptype_hybrid;
+ public static final int maptype_hybrid = 0;
+ public static final int maptype_roadmap = 1;
+ public static final int maptype_satellite = 2;
+ public static final int maptype_terrain = 3;
+ public static final int maptype_default = maptype_hybrid;
- static final int default_zoom = 15;
- static final int min_zoom = 3;
- static final int max_zoom = 21;
+ public static final int default_zoom = 15;
+ public static final int min_zoom = 3;
+ public static final int max_zoom = 21;
- static final String[] maptype_names = {
+ public static final String[] maptype_names = {
"hybrid",
"roadmap",
"satellite",
};
AltosMapInterface map_interface;
+ int scale;
AltosMapCache cache;
- LinkedList<AltosMapMark> marks = new LinkedList<AltosMapMark>();
-
- LinkedList<AltosMapZoomListener> zoom_listeners = new LinkedList<AltosMapZoomListener>();
+ public AltosMapCache cache() { return cache; }
- public void add_zoom_listener(AltosMapZoomListener listener) {
- if (!zoom_listeners.contains(listener))
- zoom_listeners.add(listener);
- }
+ LinkedList<AltosMapMark> marks = new LinkedList<AltosMapMark>();
- public void remove_zoom_listener(AltosMapZoomListener listener) {
- zoom_listeners.remove(listener);
- }
+ AltosMapPath path;
+ AltosMapLine line;
+ public AltosLatLon last_position;
boolean have_boost = false;
boolean have_landed = false;
*/
static final long auto_scroll_delay = 20 * 1000;
- AltosMapTransform transform;
+ public AltosMapTransform transform;
AltosLatLon centre;
public void reset() {
}
/* MapInterface wrapping functions */
- public void set_units() {
- map_interface.set_units();
- }
- public void repaint(AltosMapRectangle damage, int pad) {
- map_interface.repaint(damage, pad);
+ public void repaint(int x, int y, int w, int h) {
+ map_interface.repaint(new AltosRectangle(x, y, w, h));
}
- public void repaint(double x, double y, double w, double h) {
- map_interface.repaint(x, y, w, h);
+ public void repaint(AltosMapRectangle damage, int pad) {
+ AltosRectangle r = transform.screen(damage);
+ repaint(r.x - pad, r.y - pad, r.width + pad * 2, r.height + pad * 2);
}
public void repaint() {
return map_interface.height();
}
- public AltosPointInt floor(AltosPointDouble point) {
+ public void debug(String format, Object ... arguments) {
+ map_interface.debug(format, arguments);
+ }
+
+ static public AltosPointInt floor(AltosPointDouble point) {
return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
}
- public AltosPointInt ceil(AltosPointDouble point) {
+ static public AltosPointInt ceil(AltosPointDouble point) {
return new AltosPointInt ((int) Math.ceil(point.x / AltosMap.px_size) * AltosMap.px_size,
(int) Math.ceil(point.y / AltosMap.px_size) * AltosMap.px_size);
}
return (System.currentTimeMillis() - user_input_time) < auto_scroll_delay;
}
+ public boolean has_centre() {
+ return centre != null;
+ }
+
public boolean far_from_centre(AltosLatLon lat_lon) {
if (centre == null || transform == null)
return false;
}
- public void font_size_changed(int font_size) {
- map_interface.line.font_size_changed(font_size);
- for (AltosMapTile tile : tiles.values())
- tile.font_size_changed(font_size);
- repaint();
+ public void set_transform() {
+ if (centre != null) {
+ transform = new AltosMapTransform(width(), height(), zoom, centre);
+ repaint();
+ }
}
- public void units_changed(boolean imperial_units) {
+ private void set_zoom_label() {
+ map_interface.set_zoom_label(String.format("Zoom %d", get_zoom() - default_zoom));
}
- private void set_transform() {
- transform = new AltosMapTransform(width(), height(), zoom, centre);
- repaint();
- }
public boolean set_zoom(int zoom) {
+ notice_user_input();
if (AltosMap.min_zoom <= zoom && zoom <= AltosMap.max_zoom && zoom != this.zoom) {
this.zoom = zoom;
tiles.clear();
set_transform();
-
- for (AltosMapZoomListener listener : zoom_listeners)
- listener.zoom_changed(this.zoom);
-
+ set_zoom_label();
return true;
}
return false;
}
+ public boolean set_zoom_centre(int zoom, AltosPointInt centre) {
+ AltosLatLon mouse_lat_lon = null;
+ boolean ret;
+
+ if (transform != null)
+ mouse_lat_lon = transform.screen_lat_lon(centre);
+
+ ret = set_zoom(zoom);
+
+ if (ret && mouse_lat_lon != null) {
+ AltosPointDouble new_mouse = transform.screen(mouse_lat_lon);
+
+ double dx = width()/2.0 - centre.x;
+ double dy = height()/2.0 - centre.y;
+
+ AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointDouble(new_mouse.x + dx, new_mouse.y + dy));
+
+ centre(new_centre);
+ }
+
+ return ret;
+ }
+
public int get_zoom() {
return zoom;
}
if (!gps.locked && gps.nsat < 4)
return;
- AltosMapRectangle damage = map_interface.path.add(gps.lat, gps.lon, state.state);
-
- switch (state.state) {
+ switch (state.state()) {
case AltosLib.ao_flight_boost:
if (!have_boost) {
- add_mark(gps.lat, gps.lon, state.state);
+ add_mark(gps.lat, gps.lon, state.state());
have_boost = true;
}
break;
case AltosLib.ao_flight_landed:
if (!have_landed) {
- add_mark(gps.lat, gps.lon, state.state);
+ add_mark(gps.lat, gps.lon, state.state());
have_landed = true;
}
break;
}
- if (damage != null)
- repaint(damage, AltosMapPath.stroke_width);
+ if (path != null) {
+ AltosMapRectangle damage = path.add(gps.lat, gps.lon, state.state());
+
+ if (damage != null)
+ repaint(damage, AltosMapPath.stroke_width);
+ }
+
+ last_position = new AltosLatLon(gps.lat, gps.lon);
+
maybe_centre(gps.lat, gps.lon);
}
public void add_mark(double lat, double lon, int state) {
synchronized(marks) {
- marks.add(map_interface.new_mark(lat, lon, state));
+ AltosMapMark mark = map_interface.new_mark(lat, lon, state);
+ if (mark != null)
+ marks.add(mark);
}
repaint();
}
lower_right = new AltosPointInt(centre.x + load_radius * AltosMap.px_size,
centre.y + load_radius * AltosMap.px_size);
} else {
- upper_left = floor(transform.screen_point(new AltosPointDouble(0.0, 0.0)));
- lower_right = floor(transform.screen_point(new AltosPointDouble(width(), height())));
+ upper_left = floor(transform.screen_point(new AltosPointInt(0, 0)));
+ lower_right = floor(transform.screen_point(new AltosPointInt(width(), height())));
}
- LinkedList<AltosPointInt> to_remove = new LinkedList<AltosPointInt>();
- for (AltosPointInt point : tiles.keySet()) {
+ Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+ while (keyEnumeration.hasMoreElements()) {
+ AltosPointInt point = keyEnumeration.nextElement();
if (point.x < upper_left.x || lower_right.x < point.x ||
point.y < upper_left.y || lower_right.y < point.y) {
- to_remove.add(point);
+ tiles.remove(point);
}
}
- for (AltosPointInt point : to_remove)
- tiles.remove(point);
-
cache.set_cache_size((width() / AltosMap.px_size + 2) * (height() / AltosMap.px_size + 2));
+
for (int y = (int) upper_left.y; y <= lower_right.y; y += AltosMap.px_size) {
for (int x = (int) upper_left.x; x <= lower_right.x; x += AltosMap.px_size) {
- AltosPointInt point = new AltosPointInt(x, y);
+ AltosPointInt point = new AltosPointInt(x, y);
if (!tiles.containsKey(point)) {
- AltosLatLon ul = transform.lat_lon(new AltosPointDouble(x, y));
+ AltosLatLon ul = transform.lat_lon(point);
AltosLatLon center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
- AltosMapTile tile = new AltosMapTile(this, ul, center, zoom, maptype,
- AltosMap.px_size);
+ AltosMapTile tile = map_interface.new_tile(cache, ul, center, zoom, maptype, px_size, scale);
+ debug("show state %s url %s\n", AltosMapTile.status_name(tile.store.status()), tile.store.url);
+ tile.add_listener(this);
tiles.put(point, tile);
}
}
}
}
- public void set_load_params(double lat, double lon, int radius, AltosMapTileListener listener) {
+ public void set_load_params(int new_zoom, int new_type, double lat, double lon, int radius, AltosMapTileListener listener) {
+ if (AltosMap.min_zoom <= new_zoom && new_zoom <= AltosMap.max_zoom)
+ zoom = new_zoom;
+ maptype = new_type;
load_centre = new AltosLatLon(lat, lon);
load_radius = radius;
load_listener = listener;
centre(lat, lon);
+ tiles.clear();
make_tiles();
- for (AltosMapTile tile : tiles.values()) {
- tile.add_store_listener(this);
- if (tile.store_status() != AltosMapTile.loading)
- listener.notify_tile(tile, tile.store_status());
- }
repaint();
}
return "Map";
}
+ public void paint() {
+ if (centre != null)
+ make_tiles();
+
+ if (transform == null)
+ return;
+
+ for (AltosMapTile tile : tiles.values())
+ tile.paint(transform);
+
+ synchronized(marks) {
+ for (AltosMapMark mark : marks)
+ mark.paint(transform);
+ }
+
+ if (path != null)
+ path.paint(transform);
+
+ if (line != null)
+ line.paint(transform);
+ }
+
/* AltosMapTileListener methods */
public synchronized void notify_tile(AltosMapTile tile, int status) {
- for (AltosPointInt point : tiles.keySet()) {
+ Enumeration<AltosPointInt> keyEnumeration = tiles.keys();
+
+ while (keyEnumeration.hasMoreElements()) {
+ AltosPointInt point = keyEnumeration.nextElement();
if (tile == tiles.get(point)) {
AltosPointInt screen = transform.screen(point);
repaint(screen.x, screen.y, AltosMap.px_size, AltosMap.px_size);
}
}
- public AltosMap(AltosMapInterface map_interface) {
+ /* UI elements */
+
+ AltosPointInt drag_start;
+
+ boolean dragged;
+
+ static final double drag_far = 20;
+
+ private void drag(int x, int y) {
+ if (drag_start == null)
+ return;
+
+ int dx = x - drag_start.x;
+ int dy = y - drag_start.y;
+
+ double distance = Math.hypot(dx, dy);
+
+ if (distance > drag_far)
+ dragged = true;
+
+ if (transform == null)
+ return;
+
+ AltosLatLon new_centre = transform.screen_lat_lon(new AltosPointInt(width() / 2 - dx, height() / 2 - dy));
+ centre(new_centre);
+ drag_start = new AltosPointInt(x, y);
+ }
+
+ private void drag_start(int x, int y) {
+ drag_start = new AltosPointInt(x, y);
+ dragged = false;
+ }
+
+ private void drag_stop(int x, int y) {
+ if (!dragged) {
+ if (transform == null) {
+ return;
+ }
+ map_interface.select_object (transform.screen_lat_lon(new AltosPointInt(x,y)));
+ }
+ }
+
+ private void line_start(int x, int y) {
+ if (line != null && transform != null) {
+ line.pressed(new AltosPointInt(x, y), transform);
+ repaint();
+ }
+ }
+
+ private void line(int x, int y) {
+ if (line != null && transform != null) {
+ line.dragged(new AltosPointInt(x, y), transform);
+ repaint();
+ }
+ }
+
+ public void touch_start(int x, int y, boolean is_drag) {
+ notice_user_input();
+ if (is_drag)
+ drag_start(x, y);
+ else
+ line_start(x, y);
+ }
+
+ public void touch_continue(int x, int y, boolean is_drag) {
+ notice_user_input();
+ if (is_drag)
+ drag(x, y);
+ else
+ line(x, y);
+ }
+
+ public void touch_stop(int x, int y, boolean is_drag) {
+ notice_user_input();
+ if (is_drag)
+ drag_stop(x, y);
+ }
+
+ public AltosMap(AltosMapInterface map_interface, int scale) {
this.map_interface = map_interface;
+ this.scale = scale;
cache = new AltosMapCache(map_interface);
- centre(0, 0);
+ line = map_interface.new_line();
+ path = map_interface.new_path();
+ set_zoom_label();
+ }
+
+ public AltosMap(AltosMapInterface map_interface) {
+ this(map_interface, 1);
}
}
projects / fw / altos / blobdiff