X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIMapPreload.java;h=ffd974acd16855aaa6f8386b70a25a81aae596a7;hb=efc2c093819b3ec2e5743126efb76d3a9c0ad231;hp=326900372638515ad53b47415d4ca268fa7ae02f;hpb=f982248573c1b646ac53fde980a60ada5404f6aa;p=fw%2Faltos

diff --git a/altosuilib/AltosUIMapPreload.java b/altosuilib/AltosUIMapPreload.java
index 32690037..ffd974ac 100644
--- a/altosuilib/AltosUIMapPreload.java
+++ b/altosuilib/AltosUIMapPreload.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +27,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 class AltosUIMapPos extends Box implements ActionListener {
 	AltosUIMapPreload	preload;
@@ -143,7 +144,9 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 	JToggleButton	load_button;
 	JButton		close_button;
 
+/*
 	JCheckBox[]	maptypes = new JCheckBox[AltosMap.maptype_terrain - AltosMap.maptype_hybrid + 1];
+*/
 
 	JComboBox<Integer>	min_zoom;
 	JComboBox<Integer>	max_zoom;
@@ -214,11 +217,14 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 
 
 	private int all_types() {
+/*
 		int all_types = 0;
 		for (int t = AltosMap.maptype_hybrid; t <= AltosMap.maptype_terrain; t++)
 			if (maptypes[t].isSelected())
 				all_types |= (1 << t);
 		return all_types;
+*/
+		return 1 << AltosMap.maptype_hybrid;
 	}
 
 	void center_map(double latitude, double longitude) {
@@ -484,6 +490,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 
 		pane.add(close_button, c);
 
+/*
 		JLabel	types_label = new JLabel("Map Types");
 		c.gridx = 2;
 		c.gridwidth = 2;
@@ -500,6 +507,7 @@ public class AltosUIMapPreload extends AltosUIFrame implements ActionListener, I
 			c.gridy = (type & 1) + 3;
 			pane.add(maptypes[type], c);
 		}
+*/
 
 		JLabel	min_zoom_label = new JLabel("Minimum Zoom");
 		c.gridx = 4;