projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java library versions
[fw/altos]
/
altosuilib
/
AltosUIMapPreloadNew.java
diff --git
a/altosuilib/AltosUIMapPreloadNew.java
b/altosuilib/AltosUIMapPreloadNew.java
index 3e4a604fa80cd6356bb25a0b37cb6a25831aebaf..b16659da5b79f6fb1854dde89cef1d50cec503ab 100644
(file)
--- a/
altosuilib/AltosUIMapPreloadNew.java
+++ b/
altosuilib/AltosUIMapPreloadNew.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1
0
;
+package org.altusmetrum.altosuilib_1
1
;
import java.awt.*;
import java.awt.event.*;
import java.awt.*;
import java.awt.event.*;
@@
-26,7
+26,7
@@
import java.text.*;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
import java.lang.Math;
import java.net.URL;
import java.net.URLConnection;
-import org.altusmetrum.altoslib_1
0
.*;
+import org.altusmetrum.altoslib_1
1
.*;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
class AltosUIMapPos extends Box {
AltosUIFrame owner;
@@
-138,6
+138,7
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
JComboBox<Double> radius;
JComboBox<Integer> min_zoom;
JComboBox<Integer> max_zoom;
JComboBox<Double> radius;
+ int scale = 1;
Integer[] zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
Integer[] zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
@@
-249,9
+250,12
@@
public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
else
r = r * 1000;
else
r = r * 1000;
- loader = new AltosMapLoader(map.map, this,
+ map.map.centre(new AltosLatLon(latitude, longitude));
+
+ loader = new AltosMapLoader(this,
latitude, longitude,
latitude, longitude,
- min_z, max_z, r, all_types());
+ min_z, max_z, r,
+ all_types(), scale);
} catch (ParseException pe) {
load_button.setSelected(false);
} catch (ParseException pe) {
load_button.setSelected(false);