The JXMapKit is a pair of JXMapViewers preconfigured to be easy to use
- * with common features built in. This includes zoom buttons, a zoom slider,
- * and a mini-map in the lower right corner showing an overview of the map.
- * Each feature can be turned off using an appropriate
- * isXvisible property. For example, to turn
- * off the minimap call
- *
- *
jxMapKit.setMiniMapVisible(false);- * The JXMapViewer is preconfigured to connect to maps.swinglabs.org which - * serves up global satellite imagery from NASA's - * Blue - * Marble NG image collection. - *
- * @author joshy - */ -public class JXMapKit extends JPanel -{ - private static final long serialVersionUID = -8366577998349912380L; - private boolean miniMapVisible = true; - private boolean zoomSliderVisible = true; - private boolean zoomButtonsVisible = true; - private final boolean sliderReversed = false; - - @SuppressWarnings("javadoc") - public enum DefaultProviders - { - SwingLabsBlueMarble, OpenStreetMaps, Custom - } - - private DefaultProviders defaultProvider = DefaultProviders.SwingLabsBlueMarble; - - private boolean addressLocationShown = true; - - private boolean dataProviderCreditShown = true; - - /** - * Creates a new JXMapKit - */ - public JXMapKit() - { - initComponents(); - setDataProviderCreditShown(false); - - zoomSlider.setOpaque(false); - try - { - Icon minusIcon = new ImageIcon(getClass().getResource("/org/jdesktop/swingx/mapviewer/resources/minus.png")); - this.zoomOutButton.setIcon(minusIcon); - this.zoomOutButton.setText(""); - Icon plusIcon = new ImageIcon(getClass().getResource("/org/jdesktop/swingx/mapviewer/resources/plus.png")); - this.zoomInButton.setIcon(plusIcon); - this.zoomInButton.setText(""); - } - catch (Throwable thr) - { - System.out.println("error: " + thr.getMessage()); - thr.printStackTrace(); - } - - setTileFactory(new CylindricalProjectionTileFactory()); - - mainMap.setCenterPosition(new GeoPosition(0, 0)); - miniMap.setCenterPosition(new GeoPosition(0, 0)); - mainMap.setRestrictOutsidePanning(true); - miniMap.setRestrictOutsidePanning(true); - - rebuildMainMapOverlay(); - - /* - * // adapter to move the minimap after the main map has moved MouseInputAdapter ma = new MouseInputAdapter() { - * public void mouseReleased(MouseEvent e) { miniMap.setCenterPosition(mapCenterPosition); } }; - * mainMap.addMouseMotionListener(ma); mainMap.addMouseListener(ma); - */ - - mainMap.addPropertyChangeListener("center", new PropertyChangeListener() - { - @Override - public void propertyChange(PropertyChangeEvent evt) - { - Point2D mapCenter = (Point2D) evt.getNewValue(); - TileFactory tf = mainMap.getTileFactory(); - GeoPosition mapPos = tf.pixelToGeo(mapCenter, mainMap.getZoom()); - miniMap.setCenterPosition(mapPos); - } - }); - - mainMap.addPropertyChangeListener("centerPosition", new PropertyChangeListener() - { - @Override - public void propertyChange(PropertyChangeEvent evt) - { - mapCenterPosition = (GeoPosition) evt.getNewValue(); - miniMap.setCenterPosition(mapCenterPosition); - Point2D pt = miniMap.getTileFactory().geoToPixel(mapCenterPosition, miniMap.getZoom()); - miniMap.setCenter(pt); - miniMap.repaint(); - } - }); - - mainMap.addPropertyChangeListener("zoom", new PropertyChangeListener() - { - @Override - public void propertyChange(PropertyChangeEvent evt) - { - zoomSlider.setValue(mainMap.getZoom()); - miniMap.setZoom(mainMap.getZoom() + 4); - } - }); - - // an overlay for the mini-map which shows a rectangle representing the main map - miniMap.setOverlayPainter(new PainterThe JXMapKit is a pair of JXMapViewers preconfigured to be easy to use
+ * with common features built in. This includes zoom buttons, a zoom slider,
+ * and a mini-map in the lower right corner showing an overview of the map.
+ * Each feature can be turned off using an appropriate
+ * isXvisible property. For example, to turn
+ * off the minimap call
+ *
+ *
jxMapKit.setMiniMapVisible(false);+ * The JXMapViewer is preconfigured to connect to maps.swinglabs.org which + * serves up global satellite imagery from NASA's + * Blue + * Marble NG image collection. + *
+ * @author joshy + */ +public class JXMapKit extends JPanel +{ + private static final long serialVersionUID = -8366577998349912380L; + private boolean miniMapVisible = true; + private boolean zoomSliderVisible = true; + private boolean zoomButtonsVisible = true; + private final boolean sliderReversed = false; + + @SuppressWarnings("javadoc") + public enum DefaultProviders + { + SwingLabsBlueMarble, OpenStreetMaps, Custom + } + + private DefaultProviders defaultProvider = DefaultProviders.SwingLabsBlueMarble; + + private boolean addressLocationShown = true; + + private boolean dataProviderCreditShown = true; + + /** + * Creates a new JXMapKit + */ + public JXMapKit() + { + initComponents(); + setDataProviderCreditShown(false); + + zoomSlider.setOpaque(false); + try + { + Icon minusIcon = new ImageIcon(getClass().getResource("/org/jdesktop/swingx/mapviewer/resources/minus.png")); + this.zoomOutButton.setIcon(minusIcon); + this.zoomOutButton.setText(""); + Icon plusIcon = new ImageIcon(getClass().getResource("/org/jdesktop/swingx/mapviewer/resources/plus.png")); + this.zoomInButton.setIcon(plusIcon); + this.zoomInButton.setText(""); + } + catch (Throwable thr) + { + System.out.println("error: " + thr.getMessage()); + thr.printStackTrace(); + } + + setTileFactory(new CylindricalProjectionTileFactory()); + + mainMap.setCenterPosition(new GeoPosition(0, 0)); + miniMap.setCenterPosition(new GeoPosition(0, 0)); + mainMap.setRestrictOutsidePanning(true); + miniMap.setRestrictOutsidePanning(true); + + rebuildMainMapOverlay(); + + /* + * // adapter to move the minimap after the main map has moved MouseInputAdapter ma = new MouseInputAdapter() { + * public void mouseReleased(MouseEvent e) { miniMap.setCenterPosition(mapCenterPosition); } }; + * mainMap.addMouseMotionListener(ma); mainMap.addMouseListener(ma); + */ + + mainMap.addPropertyChangeListener("center", new PropertyChangeListener() + { + @Override + public void propertyChange(PropertyChangeEvent evt) + { + Point2D mapCenter = (Point2D) evt.getNewValue(); + TileFactory tf = mainMap.getTileFactory(); + GeoPosition mapPos = tf.pixelToGeo(mapCenter, mainMap.getZoom()); + miniMap.setCenterPosition(mapPos); + } + }); + + mainMap.addPropertyChangeListener("centerPosition", new PropertyChangeListener() + { + @Override + public void propertyChange(PropertyChangeEvent evt) + { + mapCenterPosition = (GeoPosition) evt.getNewValue(); + miniMap.setCenterPosition(mapCenterPosition); + Point2D pt = miniMap.getTileFactory().geoToPixel(mapCenterPosition, miniMap.getZoom()); + miniMap.setCenter(pt); + miniMap.repaint(); + } + }); + + mainMap.addPropertyChangeListener("zoom", new PropertyChangeListener() + { + @Override + public void propertyChange(PropertyChangeEvent evt) + { + zoomSlider.setValue(mainMap.getZoom()); + miniMap.setZoom(mainMap.getZoom() + 4); + } + }); + + // an overlay for the mini-map which shows a rectangle representing the main map + miniMap.setOverlayPainter(new Painternull)
- * @param factory the new property value
- */
- public void setTileFactory(TileFactory factory)
- {
- if (factory == null)
- throw new NullPointerException("factory must not be null");
-
- this.factory.removeTileListener(tileLoadListener);
- this.factory.dispose();
-
- this.factory = factory;
- this.setZoom(factory.getInfo().getDefaultZoomLevel());
-
- factory.addTileListener(tileLoadListener);
-
- repaint();
- }
-
- /**
- * A property for an image which will be display when an image is still loading.
- * @return the current property value
- */
- public Image getLoadingImage()
- {
- return loadingImage;
- }
-
- /**
- * A property for an image which will be display when an image is still loading.
- * @param loadingImage the new property value
- */
- public void setLoadingImage(Image loadingImage)
- {
- this.loadingImage = loadingImage;
- }
-
- /**
- * Gets the current pixel center of the map. This point is in the global bitmap coordinate system, not as lat/longs.
- * @return the current center of the map as a pixel value
- */
- public Point2D getCenter()
- {
- return center;
- }
-
- /**
- * Sets the new center of the map in pixel coordinates.
- * @param center the new center of the map in pixel coordinates
- */
- public void setCenter(Point2D center)
- {
- Point2D old = this.getCenter();
-
- double centerX = center.getX();
- double centerY = center.getY();
-
- Dimension mapSize = getTileFactory().getMapSize(getZoom());
- int mapHeight = (int) mapSize.getHeight() * getTileFactory().getTileSize(getZoom());
- int mapWidth = (int) mapSize.getWidth() * getTileFactory().getTileSize(getZoom());
-
- if (isRestrictOutsidePanning())
- {
- Insets insets = getInsets();
- int viewportHeight = getHeight() - insets.top - insets.bottom;
- int viewportWidth = getWidth() - insets.left - insets.right;
-
- // don't let the user pan over the top edge
- Rectangle newVP = calculateViewportBounds(center);
- if (newVP.getY() < 0)
- {
- centerY = viewportHeight / 2;
- }
-
- // don't let the user pan over the left edge
- if (!isHorizontalWrapped() && newVP.getX() < 0)
- {
- centerX = viewportWidth / 2;
- }
-
- // don't let the user pan over the bottom edge
- if (newVP.getY() + newVP.getHeight() > mapHeight)
- {
- centerY = mapHeight - viewportHeight / 2;
- }
-
- // don't let the user pan over the right edge
- if (!isHorizontalWrapped() && (newVP.getX() + newVP.getWidth() > mapWidth))
- {
- centerX = mapWidth - viewportWidth / 2;
- }
-
- // if map is to small then just center it vert
- if (mapHeight < newVP.getHeight())
- {
- centerY = mapHeight / 2;// viewportHeight/2;// - mapHeight/2;
- }
-
- // if map is too small then just center it horiz
- if (!isHorizontalWrapped() && mapWidth < newVP.getWidth())
- {
- centerX = mapWidth / 2;
- }
- }
-
- // If center is outside (0, 0,mapWidth, mapHeight)
- // compute modulo to get it back in.
- {
- centerX = centerX % mapWidth;
- centerY = centerY % mapHeight;
-
- if (centerX < 0)
- centerX += mapWidth;
-
- if (centerY < 0)
- centerY += mapHeight;
- }
-
- GeoPosition oldGP = this.getCenterPosition();
- this.center = new Point2D.Double(centerX, centerY);
- firePropertyChange("center", old, this.center);
- firePropertyChange("centerPosition", oldGP, this.getCenterPosition());
- repaint();
- }
-
- /**
- * Calculates a zoom level so that all points in the specified set will be visible on screen. This is useful if you
- * have a bunch of points in an area like a city and you want to zoom out so that the entire city and it's points
- * are visible without panning.
- * @param positions A set of GeoPositions to calculate the new zoom from
- */
- public void calculateZoomFrom(Setnull)
+ * @param factory the new property value
+ */
+ public void setTileFactory(TileFactory factory)
+ {
+ if (factory == null)
+ throw new NullPointerException("factory must not be null");
+
+ this.factory.removeTileListener(tileLoadListener);
+ this.factory.dispose();
+
+ this.factory = factory;
+ this.setZoom(factory.getInfo().getDefaultZoomLevel());
+
+ factory.addTileListener(tileLoadListener);
+
+ repaint();
+ }
+
+ /**
+ * A property for an image which will be display when an image is still loading.
+ * @return the current property value
+ */
+ public Image getLoadingImage()
+ {
+ return loadingImage;
+ }
+
+ /**
+ * A property for an image which will be display when an image is still loading.
+ * @param loadingImage the new property value
+ */
+ public void setLoadingImage(Image loadingImage)
+ {
+ this.loadingImage = loadingImage;
+ }
+
+ /**
+ * Gets the current pixel center of the map. This point is in the global bitmap coordinate system, not as lat/longs.
+ * @return the current center of the map as a pixel value
+ */
+ public Point2D getCenter()
+ {
+ return center;
+ }
+
+ /**
+ * Sets the new center of the map in pixel coordinates.
+ * @param center the new center of the map in pixel coordinates
+ */
+ public void setCenter(Point2D center)
+ {
+ Point2D old = this.getCenter();
+
+ double centerX = center.getX();
+ double centerY = center.getY();
+
+ Dimension mapSize = getTileFactory().getMapSize(getZoom());
+ int mapHeight = (int) mapSize.getHeight() * getTileFactory().getTileSize(getZoom());
+ int mapWidth = (int) mapSize.getWidth() * getTileFactory().getTileSize(getZoom());
+
+ if (isRestrictOutsidePanning())
+ {
+ Insets insets = getInsets();
+ int viewportHeight = getHeight() - insets.top - insets.bottom;
+ int viewportWidth = getWidth() - insets.left - insets.right;
+
+ // don't let the user pan over the top edge
+ Rectangle newVP = calculateViewportBounds(center);
+ if (newVP.getY() < 0)
+ {
+ centerY = viewportHeight / 2;
+ }
+
+ // don't let the user pan over the left edge
+ if (!isHorizontalWrapped() && newVP.getX() < 0)
+ {
+ centerX = viewportWidth / 2;
+ }
+
+ // don't let the user pan over the bottom edge
+ if (newVP.getY() + newVP.getHeight() > mapHeight)
+ {
+ centerY = mapHeight - viewportHeight / 2;
+ }
+
+ // don't let the user pan over the right edge
+ if (!isHorizontalWrapped() && (newVP.getX() + newVP.getWidth() > mapWidth))
+ {
+ centerX = mapWidth - viewportWidth / 2;
+ }
+
+ // if map is to small then just center it vert
+ if (mapHeight < newVP.getHeight())
+ {
+ centerY = mapHeight / 2;// viewportHeight/2;// - mapHeight/2;
+ }
+
+ // if map is too small then just center it horiz
+ if (!isHorizontalWrapped() && mapWidth < newVP.getWidth())
+ {
+ centerX = mapWidth / 2;
+ }
+ }
+
+ // If center is outside (0, 0,mapWidth, mapHeight)
+ // compute modulo to get it back in.
+ {
+ centerX = centerX % mapWidth;
+ centerY = centerY % mapHeight;
+
+ if (centerX < 0)
+ centerX += mapWidth;
+
+ if (centerY < 0)
+ centerY += mapHeight;
+ }
+
+ GeoPosition oldGP = this.getCenterPosition();
+ this.center = new Point2D.Double(centerX, centerY);
+ firePropertyChange("center", old, this.center);
+ firePropertyChange("centerPosition", oldGP, this.getCenterPosition());
+ repaint();
+ }
+
+ /**
+ * Calculates a zoom level so that all points in the specified set will be visible on screen. This is useful if you
+ * have a bunch of points in an area like a city and you want to zoom out so that the entire city and it's points
+ * are visible without panning.
+ * @param positions A set of GeoPositions to calculate the new zoom from
+ */
+ public void calculateZoomFrom(SetExecutorService.
- * @param tile The tile to load.
- */
- protected abstract void startLoading(Tile tile);
-
-}
+/*
+ * TileFactory.java
+ *
+ * Created on March 17, 2006, 8:01 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package org.jdesktop.swingx.mapviewer;
+
+import java.awt.Dimension;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jdesktop.swingx.mapviewer.util.GeoUtil;
+
+/**
+ * A class that can produce tiles and convert coordinates to pixels
+ * @author joshy
+ */
+public abstract class TileFactory
+{
+ private TileFactoryInfo info;
+ private ListExecutorService.
+ * @param tile The tile to load.
+ */
+ protected abstract void startLoading(Tile tile);
+
+}
diff --git a/src/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java b/src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java
diff --git a/src/org/jdesktop/swingx/mapviewer/TileListener.java b/src/main/java/org/jdesktop/swingx/mapviewer/TileListener.java
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/TileListener.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/TileListener.java
diff --git a/src/org/jdesktop/swingx/mapviewer/Waypoint.java b/src/main/java/org/jdesktop/swingx/mapviewer/Waypoint.java
similarity index 95%
rename from src/org/jdesktop/swingx/mapviewer/Waypoint.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/Waypoint.java
index 9666dc2a..b5c06033 100644
--- a/src/org/jdesktop/swingx/mapviewer/Waypoint.java
+++ b/src/main/java/org/jdesktop/swingx/mapviewer/Waypoint.java
@@ -1,25 +1,25 @@
-/*
- * Waypoint.java
- *
- * Created on March 30, 2006, 5:22 PM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package org.jdesktop.swingx.mapviewer;
-
-
-/**
- * A Waypoint is a GeoPosition that can be
- * drawn on a may using a WaypointPainter.
- * @author joshy
- */
-public interface Waypoint
-{
- /**
- * Get the current GeoPosition of this Waypoint
- * @return the current position
- */
- public GeoPosition getPosition();
-}
+/*
+ * Waypoint.java
+ *
+ * Created on March 30, 2006, 5:22 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package org.jdesktop.swingx.mapviewer;
+
+
+/**
+ * A Waypoint is a GeoPosition that can be
+ * drawn on a may using a WaypointPainter.
+ * @author joshy
+ */
+public interface Waypoint
+{
+ /**
+ * Get the current GeoPosition of this Waypoint
+ * @return the current position
+ */
+ public GeoPosition getPosition();
+}
diff --git a/src/org/jdesktop/swingx/mapviewer/WaypointPainter.java b/src/main/java/org/jdesktop/swingx/mapviewer/WaypointPainter.java
similarity index 95%
rename from src/org/jdesktop/swingx/mapviewer/WaypointPainter.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/WaypointPainter.java
index cd4fe88a..c1f66213 100644
--- a/src/org/jdesktop/swingx/mapviewer/WaypointPainter.java
+++ b/src/main/java/org/jdesktop/swingx/mapviewer/WaypointPainter.java
@@ -1,90 +1,90 @@
-/*
- * WaypointMapOverlay.java
- *
- * Created on April 1, 2006, 4:59 PM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package org.jdesktop.swingx.mapviewer;
-
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jdesktop.swingx.JXMapViewer;
-import org.jdesktop.swingx.painter.AbstractPainter;
-
-/**
- * Paints waypoints on the JXMapViewer. This is an
- * instance of Painter that only can draw on to JXMapViewers.
- * @param ExecutorService.
- * @param tile The tile to load.
- */
- @Override
- protected void startLoading(Tile tile)
- {
- // noop
- }
-
-}
+/*
+ * EmptyTileFactory.java
+ *
+ * Created on June 7, 2006, 4:58 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package org.jdesktop.swingx.mapviewer.empty;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+
+import org.jdesktop.swingx.mapviewer.Tile;
+import org.jdesktop.swingx.mapviewer.TileFactory;
+import org.jdesktop.swingx.mapviewer.TileFactoryInfo;
+
+/**
+ * A null implementation of TileFactory. Draws empty areas.
+ * @author joshy
+ */
+public class EmptyTileFactory extends TileFactory
+{
+ /**
+ * The empty tile image.
+ */
+ private BufferedImage emptyTile;
+
+ /**
+ * Creates a new instance of EmptyTileFactory
+ */
+ public EmptyTileFactory()
+ {
+ this(new TileFactoryInfo("EmptyTileFactory 256x256", 1, 15, 17, 256, true, true, "", "x", "y", "z"));
+ }
+
+ /**
+ * Creates a new instance of EmptyTileFactory using the specified info.
+ * @param info the tile factory info
+ */
+ public EmptyTileFactory(TileFactoryInfo info)
+ {
+ super(info);
+ int tileSize = info.getTileSize(info.getMinimumZoomLevel());
+ emptyTile = new BufferedImage(tileSize, tileSize, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D g = emptyTile.createGraphics();
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setColor(Color.GRAY);
+ g.fillRect(0, 0, tileSize, tileSize);
+ g.setColor(Color.WHITE);
+ g.drawOval(10, 10, tileSize - 20, tileSize - 20);
+ g.fillOval(70, 50, 20, 20);
+ g.fillOval(tileSize - 90, 50, 20, 20);
+ g.fillOval(tileSize / 2 - 10, tileSize / 2 - 10, 20, 20);
+ g.dispose();
+ }
+
+ /**
+ * Gets an instance of an empty tile for the given tile position and zoom on the world map.
+ * @param x The tile's x position on the world map.
+ * @param y The tile's y position on the world map.
+ * @param zoom The current zoom level.
+ */
+ @Override
+ public Tile getTile(int x, int y, int zoom)
+ {
+ return new Tile(x, y, zoom)
+ {
+ @Override
+ public synchronized boolean isLoaded()
+ {
+ return true;
+ }
+
+ @Override
+ public BufferedImage getImage()
+ {
+ return emptyTile;
+ }
+
+ };
+ }
+
+ @Override
+ public void dispose()
+ {
+ // noop
+ }
+
+ /**
+ * Override this method to load the tile using, for example, an ExecutorService.
+ * @param tile The tile to load.
+ */
+ @Override
+ protected void startLoading(Tile tile)
+ {
+ // noop
+ }
+
+}
diff --git a/src/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java
diff --git a/src/org/jdesktop/swingx/mapviewer/resources/loading.png b/src/main/java/org/jdesktop/swingx/mapviewer/resources/loading.png
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/resources/loading.png
rename to src/main/java/org/jdesktop/swingx/mapviewer/resources/loading.png
diff --git a/src/org/jdesktop/swingx/mapviewer/resources/minus.png b/src/main/java/org/jdesktop/swingx/mapviewer/resources/minus.png
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/resources/minus.png
rename to src/main/java/org/jdesktop/swingx/mapviewer/resources/minus.png
diff --git a/src/org/jdesktop/swingx/mapviewer/resources/plus.png b/src/main/java/org/jdesktop/swingx/mapviewer/resources/plus.png
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/resources/plus.png
rename to src/main/java/org/jdesktop/swingx/mapviewer/resources/plus.png
diff --git a/src/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png b/src/main/java/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png
similarity index 100%
rename from src/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png
rename to src/main/java/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png
diff --git a/src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java b/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java
similarity index 97%
rename from src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java
rename to src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java
index ac1e21de..7c4b21de 100644
--- a/src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java
+++ b/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java
@@ -1,167 +1,167 @@
-/*
- * GeoUtil.java
- *
- * Created on June 26, 2006, 10:44 AM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package org.jdesktop.swingx.mapviewer.util;
-
-import java.awt.Dimension;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jdesktop.swingx.JXMapViewer;
-import org.jdesktop.swingx.mapviewer.GeoBounds;
-import org.jdesktop.swingx.mapviewer.GeoPosition;
-import org.jdesktop.swingx.mapviewer.TileFactory;
-import org.jdesktop.swingx.mapviewer.TileFactoryInfo;
-
-/**
- * These are math utilities for converting between pixels, tiles, and geographic coordinates. Implements a Google Maps
- * style mercator projection.
- * @author joshy
- */
-public final class GeoUtil
-{
- /**
- * @param zoom the zoom level
- * @param info the tile factory info
- * @return the size of the map at the given zoom, in tiles (num tiles tall by num tiles wide)
- */
- public static Dimension getMapSize(int zoom, TileFactoryInfo info)
- {
- return new Dimension(info.getMapWidthInTilesAtZoom(zoom), info.getMapWidthInTilesAtZoom(zoom));
- }
-
- /**
- * @param x the x value
- * @param y the y value
- * @param zoomLevel the zoom level
- * @param info the tile factory info
- * @return true if this point in tiles is valid at this zoom level. For example, if the zoom level is 0
- * (zoomed all the way out, where there is only one tile), then x,y must be 0,0
- */
- public static boolean isValidTile(int x, int y, int zoomLevel, TileFactoryInfo info)
- {
- // int x = (int)coord.getX();
- // int y = (int)coord.getY();
- // if off the map to the top or left
- if (x < 0 || y < 0)
- {
- return false;
- }
- // if of the map to the right
- if (info.getMapCenterInPixelsAtZoom(zoomLevel).getX() * 2 <= x * info.getTileSize(zoomLevel))
- {
- return false;
- }
- // if off the map to the bottom
- if (info.getMapCenterInPixelsAtZoom(zoomLevel).getY() * 2 <= y * info.getTileSize(zoomLevel))
- {
- return false;
- }
- // if out of zoom bounds
- if (zoomLevel < info.getMinimumZoomLevel() || zoomLevel > info.getMaximumZoomLevel())
- {
- return false;
- }
- return true;
- }
-
- /**
- * Given a position (latitude/longitude pair) and a zoom level, return the appropriate point in pixels. The
- * zoom level is necessary because pixel coordinates are in terms of the zoom level
- * @param c A lat/lon pair
- * @param zoomLevel the zoom level to extract the pixel coordinate for
- * @param info the tile factory info
- * @return the coordinate
- */
- public static Point2D getBitmapCoordinate(GeoPosition c, int zoomLevel, TileFactoryInfo info)
- {
- return getBitmapCoordinate(c.getLatitude(), c.getLongitude(), zoomLevel, info);
- }
-
- /**
- * Given a position (latitude/longitude pair) and a zoom level, return the appropriate point in pixels. The
- * zoom level is necessary because pixel coordinates are in terms of the zoom level
- * @param latitude the latitude
- * @param longitude the longitude
- * @param zoomLevel the zoom level to extract the pixel coordinate for
- * @param info the tile factory info
- * @return the coordinate
- */
- public static Point2D getBitmapCoordinate(double latitude, double longitude, int zoomLevel, TileFactoryInfo info)
- {
- double x = info.getMapCenterInPixelsAtZoom(zoomLevel).getX() + longitude
- * info.getLongitudeDegreeWidthInPixels(zoomLevel);
- double e = Math.sin(latitude * (Math.PI / 180.0));
- if (e > 0.9999)
- {
- e = 0.9999;
- }
- if (e < -0.9999)
- {
- e = -0.9999;
- }
- double y = info.getMapCenterInPixelsAtZoom(zoomLevel).getY() + 0.5 * Math.log((1 + e) / (1 - e)) * -1
- * (info.getLongitudeRadianWidthInPixels(zoomLevel));
- return new Point2D.Double(x, y);
- }
-
- /**
- * Convert an on screen pixel coordinate and a zoom level to a geo position
- * @param pixelCoordinate the coordinate in pixels
- * @param zoom the zoom level
- * @param info the tile factory info
- * @return a geo position
- */
- public static GeoPosition getPosition(Point2D pixelCoordinate, int zoom, TileFactoryInfo info)
- {
- // p(" --bitmap to latlon : " + coord + " " + zoom);
- double wx = pixelCoordinate.getX();
- double wy = pixelCoordinate.getY();
- // this reverses getBitmapCoordinates
- double flon = (wx - info.getMapCenterInPixelsAtZoom(zoom).getX()) / info.getLongitudeDegreeWidthInPixels(zoom);
- double e1 = (wy - info.getMapCenterInPixelsAtZoom(zoom).getY())
- / (-1 * info.getLongitudeRadianWidthInPixels(zoom));
- double e2 = (2 * Math.atan(Math.exp(e1)) - Math.PI / 2) / (Math.PI / 180.0);
- double flat = e2;
- GeoPosition wc = new GeoPosition(flat, flon);
- return wc;
- }
-
- /**
- * Gets the map bounds.
- * @param mapViewer The map viewer.
- * @return Returns the bounds.
- */
- public static GeoBounds getMapBounds(JXMapViewer mapViewer)
- {
- return new GeoBounds(getMapGeoBounds(mapViewer));
- }
-
- /**
- * Gets the bounds as a set of two GeoPosition objects.
- * @param mapViewer The map viewer.
- * @return Returns the set of two GeoPosition objects that represent the north west and south east
- * corners of the map.
- */
- private static SetGeoPosition objects.
+ * @param mapViewer The map viewer.
+ * @return Returns the set of two GeoPosition objects that represent the north west and south east
+ * corners of the map.
+ */
+ private static SetA {@link Painter} implementation composed of an array of Painters.
- * CompoundPainter provides a means for combining several individual
- * Painters, or groups of them, into one logical unit. Each of the
- * Painters are executed in order. BufferedImageOp filter effects can
- * be applied to them together as a whole. The entire set of painting operations
- * may be cached together.
For example, if I want to create a CompoundPainter that started with a blue - * background, had pinstripes on it running at a 45 degree angle, and those - * pinstripes appeared to "fade in" from left to right, I would write the following: - *
- * Color blue = new Color(0x417DDD);
- * Color translucent = new Color(blue.getRed(), blue.getGreen(), blue.getBlue(), 0);
- * panel.setBackground(blue);
- * panel.setForeground(Color.LIGHT_GRAY);
- * GradientPaint blueToTranslucent = new GradientPaint(
- * new Point2D.Double(.4, 0),
- * blue,
- * new Point2D.Double(1, 0),
- * translucent);
- * MattePainter veil = new MattePainter(blueToTranslucent);
- * veil.setPaintStretched(true);
- * Painter pinstripes = new PinstripePainter(45);
- * Painter backgroundPainter = new RectanglePainter(this.getBackground(), null);
- * Painter p = new CompoundPainter(backgroundPainter, pinstripes, veil);
- * panel.setBackgroundPainter(p);
- * Iterates over all child Painters and gives them a chance
- * to validate themselves. If any of the child painters are dirty, then
- * this CompoundPainter marks itself as dirty.
Painters
- * should be checked for their dirty flag as part of
- * processing.truePainters are different from each other. This
- * will allow the cacheable == true Painters to
- * keep their cached image during regular repaints. In this case,
- * client code should call {@link #clearCache()} manually when the cacheable
- * Painters should be updated.
- * @return the dirty check flag
- *
- *
- * @see #isDirty()
- */
- public boolean isCheckingDirtyChildPainters()
- {
- return checkForDirtyChildPainters;
- }
-
- /**
- * Set the flag used by {@link #isDirty()} to check if the
- * child Painters should be checked for their
- * dirty flag as part of processing.
- * @param b the dirty check flag
- *
- * @see #isCheckingDirtyChildPainters()
- * @see #isDirty()
- */
- public void setCheckingDirtyChildPainters(boolean b)
- {
- boolean old = isCheckingDirtyChildPainters();
- this.checkForDirtyChildPainters = b;
- firePropertyChange("checkingDirtyChildPainters", old, isCheckingDirtyChildPainters());
- }
-
- /**
- * This CompoundPainter is dirty if it, or (optionally)
- * any of its children, are dirty. If the super implementation returns
- * true, we return true. Otherwise, if
- * {@link #isCheckingDirtyChildPainters()} is true, we iterate
- * over all child Painters and query them to see
- * if they are dirty. If so, then true is returned.
- * Otherwise, we return false.
Clears the cache of this Painter, and all child
- * Painters. This is done to ensure that resources
- * are collected, even if clearCache is called by some framework
- * or other code that doesn't realize this is a CompoundPainter.
Call #clearLocalCache if you only want to clear the cache of this
- * Clears the cache of this painter only, and not of any of the children. A {@link Painter} implementation composed of an array of For example, if I want to create a CompoundPainter that started with a blue
+ * background, had pinstripes on it running at a 45 degree angle, and those
+ * pinstripes appeared to "fade in" from left to right, I would write the following:
+ * CompoundPainter
- */
- @Override
- public void clearCache()
- {
- if (!clearLocalCacheOnly)
- {
- for (PainterPainters.
+ * CompoundPainter provides a means for combining several individual
+ * Painters, or groups of them, into one logical unit. Each of the
+ * Painters are executed in order. BufferedImageOp filter effects can
+ * be applied to them together as a whole. The entire set of painting operations
+ * may be cached together.
+ * Color blue = new Color(0x417DDD);
+ * Color translucent = new Color(blue.getRed(), blue.getGreen(), blue.getBlue(), 0);
+ * panel.setBackground(blue);
+ * panel.setForeground(Color.LIGHT_GRAY);
+ * GradientPaint blueToTranslucent = new GradientPaint(
+ * new Point2D.Double(.4, 0),
+ * blue,
+ * new Point2D.Double(1, 0),
+ * translucent);
+ * MattePainter veil = new MattePainter(blueToTranslucent);
+ * veil.setPaintStretched(true);
+ * Painter pinstripes = new PinstripePainter(45);
+ * Painter backgroundPainter = new RectanglePainter(this.getBackground(), null);
+ * Painter p = new CompoundPainter(backgroundPainter, pinstripes, veil);
+ * panel.setBackgroundPainter(p);
+ *
Iterates over all child Painters and gives them a chance
+ * to validate themselves. If any of the child painters are dirty, then
+ * this CompoundPainter marks itself as dirty.
Painters
+ * should be checked for their dirty flag as part of
+ * processing.truePainters are different from each other. This
+ * will allow the cacheable == true Painters to
+ * keep their cached image during regular repaints. In this case,
+ * client code should call {@link #clearCache()} manually when the cacheable
+ * Painters should be updated.
+ * @return the dirty check flag
+ *
+ *
+ * @see #isDirty()
+ */
+ public boolean isCheckingDirtyChildPainters()
+ {
+ return checkForDirtyChildPainters;
+ }
+
+ /**
+ * Set the flag used by {@link #isDirty()} to check if the
+ * child Painters should be checked for their
+ * dirty flag as part of processing.
+ * @param b the dirty check flag
+ *
+ * @see #isCheckingDirtyChildPainters()
+ * @see #isDirty()
+ */
+ public void setCheckingDirtyChildPainters(boolean b)
+ {
+ boolean old = isCheckingDirtyChildPainters();
+ this.checkForDirtyChildPainters = b;
+ firePropertyChange("checkingDirtyChildPainters", old, isCheckingDirtyChildPainters());
+ }
+
+ /**
+ * This CompoundPainter is dirty if it, or (optionally)
+ * any of its children, are dirty. If the super implementation returns
+ * true, we return true. Otherwise, if
+ * {@link #isCheckingDirtyChildPainters()} is true, we iterate
+ * over all child Painters and query them to see
+ * if they are dirty. If so, then true is returned.
+ * Otherwise, we return false.
Clears the cache of this Painter, and all child
+ * Painters. This is done to ensure that resources
+ * are collected, even if clearCache is called by some framework
+ * or other code that doesn't realize this is a CompoundPainter.
Call #clearLocalCache if you only want to clear the cache of this
+ * Clears the cache of this painter only, and not of any of the children.CompoundPainter
+ */
+ @Override
+ public void clearCache()
+ {
+ if (!clearLocalCacheOnly)
+ {
+ for (Painter