projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop using /usr/share for binaries in remaining turnon scripts
[fw/altos]
/
altoslib
/
AltosMapTile.java
diff --git
a/altoslib/AltosMapTile.java
b/altoslib/AltosMapTile.java
index 19332de191385254591155f755f0c85fabebdaea..4d6dc8d124d7933c95118cc1ae881c8154c06323 100644
(file)
--- a/
altoslib/AltosMapTile.java
+++ b/
altoslib/AltosMapTile.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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
0
;
+package org.altusmetrum.altoslib_1
1
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-38,6
+39,25
@@
public class AltosMapTile implements AltosFontListener, AltosMapStoreListener {
static public final int bad_request = 4;/* downloading failed */
static public final int forbidden = 5; /* downloading failed */
static public final int bad_request = 4;/* downloading failed */
static public final int forbidden = 5; /* downloading failed */
+ static public String status_name(int status) {
+ switch (status) {
+ case loaded:
+ return "loaded";
+ case fetched:
+ return "fetched";
+ case fetching:
+ return "fetching";
+ case failed:
+ return "failed";
+ case bad_request:
+ return "bad_request";
+ case forbidden:
+ return "forbidden";
+ default:
+ return "unknown";
+ }
+ }
+
public void font_size_changed(int font_size) {
}
public void font_size_changed(int font_size) {
}
@@
-96,8
+116,4
@@
public class AltosMapTile implements AltosFontListener, AltosMapStoreListener {
store = AltosMapStore.get(center, zoom, maptype, px_size, scale);
store.add_listener(this);
}
store = AltosMapStore.get(center, zoom, maptype, px_size, scale);
store.add_listener(this);
}
-
- public AltosMapTile(AltosMapCache cache, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
- this(cache, upper_left, center, zoom, maptype, px_size, 1);
- }
}
}