Patch from Don:

-Updates to the geo package to make it easier to create GeoExtents.
-Created the com.bbn.openmap.dataAccess.shape.ShapeGeoIndex, which is a
ExtentIndex for shape files that lets you easily make intersection
queries for shape file contents.
-Added EmptyTileHandlers to mapTile package that deal with missing
tiles in tile sets.  Added
Grey*MapTileFactory components that convert tiles to greyscale on the
fly, for superior backgrounds when plotting tracking data.
-Updated BufferedImageRenderPolicy so it double checks for current projection,
this removed a jumping effect when using the scroll wheel.
-HashCodeUtil makes it easier to implement proper hash code methods.
-Update javadoc comments to get rid of errors.
-Updated LocationLayer to be OMGraphicHandlerLayer, modified popup
menu components to make it play nice with OMMouseMode, modified
LayerHandler components to match changes in LocationLayer.


git-svn-id: svn+ssh://src.dsl.bbn.com/svn/openmap/trunk@2241 f68c23cc-7f87-4fbc-acfa-d9760b90acc1

Author: krogers

build.xml

@@ -120,7 +120,7 @@
 	############################ -->
 
 	<!-- depends="jar" -->
-	<target name="run" description="Run the OpenMap application.">
+	<target name="run" depends="init" description="Run the OpenMap application.">
 		<java classname="com.bbn.openmap.app.OpenMap" classpath="lib/openmap.jar;lib/milStd2525_png.jar;lib/omcorba.jar;lib/omsvg.jar;lib/omj3d;share" fork="yes">
 			<classpath>
 				<path refid="ext_tools_classpath" />

logging.properties

@@ -57,4 +57,7 @@ java.util.logging.ConsoleHandler.formatter = com.bbn.openmap.util.OMLoggingForma
 # CONFIG, INFO, FINE, FINER, FINEST, WARN, SEVERE
 # For example, set the com.bbn.openmap.MapBean logger to only log FINE
 # messages:
-#com.bbn.openmap.MapBean.level = FINE
+#com.bbn.openmap.MapBean.level = FINE
+
+#Turns on map tile debugging
+#MAPTILE_DEBUGGING.level = FINE

openmap.properties

@@ -219,6 +219,9 @@ openmap.components=informationDelegator projFactory mouseDelegator projectionsta
 # ###
 #openmap.components=informationDelegator projFactory mouseDelegator projectionstack addlayer glc menulist toolBar mouseModePanel selectMouseMode navMouseMode distanceMouseMode omdtl deleteButton omdrawingtool omlineloader omcircleloader omrectloader ompointloader omsplineloader omdecsplineloader ompolyloader omscalingrasterloader omdistloader controlpanel layerHandler projkeys repaintPolicy srl
 
+main.components=informationDelegator projFactory mouseDelegator addlayer glc menulist toolBar deleteButton omdtl overviewMapHandler layersPanel mouseMode omdrawingtool omlineloader omcircleloader omrectloader ompointloader omsplineloader ompolyloader omscalingrasterloader omdistloader layerHandler projkeys repaintPolicy srl scalepanel
+main.activeWidgets.fillColor=BBBBBB
+
 # ###################################################
 # Menu configuration, defining the menu items listed in the
 # openmap.components list.
@@ -280,40 +283,51 @@ helpUserMenuItem.class=com.bbn.openmap.gui.menu.WebSiteHelpMenuItem
 # ###################################################
 # Defining the other components in the openmap.components list:
 
-deleteButton.class=com.bbn.openmap.gui.OMGraphicDeleteTool
+# Key components, usually always want these.
+mouseDelegator.class=com.bbn.openmap.MouseDelegator
+informationDelegator.class=com.bbn.openmap.InformationDelegator
+layerHandler.class=com.bbn.openmap.LayerHandler
+
+# General function additions
+projkeys.class=com.bbn.openmap.event.ProjMapBeanKeyListener
+repaintPolicy.class=com.bbn.openmap.HintsMapBeanRepaintPolicy
+repaintPolicy.renderingHints=KEY_ANTIALIASING
+repaintPolicy.KEY_ANTIALIASING=VALUE_ANTIALIAS_ON
+repaintPolicy.KEY_RENDERING=VALUE_RENDER_SPEED
+projectionstack.class=com.bbn.openmap.proj.ProjectionStack
+layersPanel.class=com.bbn.openmap.gui.LayersPanel
+menuPanel.class=com.bbn.openmap.gui.MenuPanel
+dndCatcher.class=com.bbn.openmap.tools.dnd.DefaultDnDCatcher
+dropSupport.class=com.bbn.openmap.tools.dnd.DropListenerSupport
+glc.class=com.bbn.openmap.plugin.graphicLoader.GraphicLoaderConnector
+
+# Mouse handling components
+mouseModePanel.class=com.bbn.openmap.gui.MouseModeButtonPanel
+selectMouseMode.class=com.bbn.openmap.event.SelectMouseMode
 distanceMouseMode.class=com.bbn.openmap.event.DistanceMouseMode
 panMouseMode.class=com.bbn.openmap.event.PanMouseMode
 # Floating number between 0-1, with 1 being opaque, default .5
 panMouseMode.opaqueness=1
 # True/false, to leave old map up behind panned version.
 panMouseMode.leaveShadow=false
-dndCatcher.class=com.bbn.openmap.tools.dnd.DefaultDnDCatcher
-dropSupport.class=com.bbn.openmap.tools.dnd.DropListenerSupport
-glc.class=com.bbn.openmap.plugin.graphicLoader.GraphicLoaderConnector
-informationDelegator.class=com.bbn.openmap.InformationDelegator
-layerHandler.class=com.bbn.openmap.LayerHandler
-layersPanel.class=com.bbn.openmap.gui.LayersPanel
-menuPanel.class=com.bbn.openmap.gui.MenuPanel
-mouseDelegator.class=com.bbn.openmap.MouseDelegator
-mouseModePanel.class=com.bbn.openmap.gui.MouseModeButtonPanel
+# There's a NavMouseMode, too.  This one defines boxes from center
 navMouseMode.class=com.bbn.openmap.event.NavMouseMode2
-navpanel.class=com.bbn.openmap.gui.NavigatePanel
 nullMouseMode.class=com.bbn.openmap.event.NullMouseMode
+# Only mouse mode in "Main" application
+mouseMode.class=com.bbn.openmap.event.OMMouseMode
+
+# Drawing tool parts
+omdtl.class=com.bbn.openmap.tools.drawing.OMDrawingToolLauncher
 omcircleloader.class=com.bbn.openmap.tools.drawing.OMCircleLoader
 omdecsplineloader.class=com.bbn.openmap.tools.drawing.OMDecoratedSplineLoader
 omdistloader.class=com.bbn.openmap.tools.drawing.OMDistanceLoader
 omdrawingtool.class=com.bbn.openmap.tools.drawing.OMDrawingTool
-omdtl.class=com.bbn.openmap.tools.drawing.OMDrawingToolLauncher
 omlineloader.class=com.bbn.openmap.tools.drawing.OMLineLoader
 ompointloader.class=com.bbn.openmap.tools.drawing.OMPointLoader
 ompolyloader.class=com.bbn.openmap.tools.drawing.OMPolyLoader
 omrectloader.class=com.bbn.openmap.tools.drawing.OMRectLoader
 omscalingrasterloader.class=com.bbn.openmap.tools.drawing.OMScalingRasterLoader
 omsplineloader.class=com.bbn.openmap.tools.drawing.OMSplineLoader
-projectionstack.class=com.bbn.openmap.proj.ProjectionStack
-projectionstacktool.class=com.bbn.openmap.gui.ProjectionStackTool
-scalepanel.class=com.bbn.openmap.gui.ScaleTextPanel
-selectMouseMode.class=com.bbn.openmap.event.SelectMouseMode
 
 # ##
 # ToolPanel definitions for the first ToolPanel 'toolbar'
@@ -333,6 +347,14 @@ toolBar.class=com.bbn.openmap.gui.ToolPanel
 # it interferes with the first ToolPanel.
 
 #toolBar2.preferredLocation=SOUTH
+
+# Specific Tools
+navpanel.class=com.bbn.openmap.gui.NavigatePanel
+deleteButton.class=com.bbn.openmap.gui.OMGraphicDeleteTool
+projectionstacktool.class=com.bbn.openmap.gui.ProjectionStackTool
+scalepanel.class=com.bbn.openmap.gui.ScaleTextPanel
+zoompanel.class=com.bbn.openmap.gui.ZoomPanel
+
 # ###
 
 projFactory.class=com.bbn.openmap.proj.ProjectionFactory
@@ -343,14 +365,7 @@ projFactory.ortholoader.class=com.bbn.openmap.proj.OrthographicLoader
 projFactory.llxyloader.class=com.bbn.openmap.proj.LLXYLoader
 projFactory.gnomonicloader.class=com.bbn.openmap.proj.GnomonicLoader
 
-zoompanel.class=com.bbn.openmap.gui.ZoomPanel
-projkeys.class=com.bbn.openmap.event.ProjMapBeanKeyListener
-
-repaintPolicy.class=com.bbn.openmap.HintsMapBeanRepaintPolicy
-repaintPolicy.renderingHints=KEY_ANTIALIASING
-repaintPolicy.KEY_ANTIALIASING=VALUE_ANTIALIAS_ON
-repaintPolicy.KEY_RENDERING=VALUE_RENDER_SPEED
-
+# Not used by default, in secondary openmap.components list, puts controls in panel left of map.
 controlpanel.class=com.bbn.openmap.gui.OMControlPanel
 controlpanel.OverviewMapHandler.overviewLayers=overviewLayer
 controlpanel.OverviewMapHandler.isTool=false
@@ -410,20 +425,16 @@ vpfcache.vpfPath=/data/vpf/vmaplv0/disk0;/data/vpf/vmaplv0/disk1
 # ###
 # Properties defined for the overview map handler.
 # ###
-
 overviewMapHandler.class=com.bbn.openmap.gui.OverviewMapHandler
 # marker name list defining background layers used on overview map.
 # The layers are defined as any other layer is below, look
 # for 'overviewLayer' properties.  This is a space-separated list of
 # marker names.
 overviewMapHandler.overviewLayers=overviewLayer
-
 # how zoomed out to keep the overview map versus the main map
 overviewMapHandler.overviewScaleFactor=10f
-
 # when to stop zooming in
 overviewMapHandler.overviewMinScale=10000000f
-
 # the layer to use to render on top, showing where the main map covers.
 overviewMapHandler.overviewStatusLayer=com.bbn.openmap.layer.OverviewMapAreaLayer
 overviewMapHandler.lineColor=ffff0000
@@ -470,6 +481,12 @@ wmsp.prettyName=WMS Layer
 epi.class=com.bbn.openmap.plugin.esri.EsriPlugIn
 epi.prettyName=Shape Layer with Attributes
 
+# To test how fast your application redraws, use this and add anime to your 
+# components list. A layer will be created for it, and the palette for the layer
+# controls the component.  You can add sprites and adjust the redrawing timer. The
+# GraphicLoaderConnector needs to be added to the components list as well.
+anime.class=com.bbn.openmap.graphicLoader.AnimationTester
+
 # End component definitions
 # ###################################################
 
@@ -520,7 +537,7 @@ png32.class=com.bbn.openmap.image.PNG32ImageFormatter
 # ###################################################
 
 # Layers listed here appear on the Map in the order of their names.
-openmap.layers=date dtlayer distlayer daynight cities test graticule demo shapePolitical
+openmap.layers=date dtlayer distlayer daynight cities test graticule demo tiles shapePolitical
 
 # If you get more data, you can add other layers defined in this file.
 # You'll want to look at the properties for each layer and modify them
@@ -531,7 +548,7 @@ openmap.layers=date dtlayer distlayer daynight cities test graticule demo shapeP
 
 # These layers are turned on when the map is first started.  Order
 # does not matter here...
-openmap.startUpLayers=graticule drawing cities shapePolitical
+openmap.startUpLayers=graticule drawing tiles shapePolitical
 
 # ###################################################
 # These are the properties for individual layers.  Consult the 
@@ -603,7 +620,6 @@ shapePolitical.prettyName=Political Boundaries
 #shapePolitical.shapeFile=data/shape/dcwpo-browse.shp
 #shapePolitical.spatialIndex=data/shape/dcwpo-browse.ssx
 shapePolitical.shapeFile=data/shape/cntry02/cntry02.shp
-shapePolitical.spatialIndex=data/shape/cntry02/cntry02.ssx
 # Colors (32bit ARGB)
 shapePolitical.lineColor=ff000000
 shapePolitical.fillColor=DAD5CB
@@ -999,3 +1015,34 @@ csvcities.latIndex=5
 csvcities.lonIndex=4
 csvcities.csvFileHasHeader=true
 
+# Map Tile Layer, using OpenStreetMap tiles
+tiles.class=com.bbn.openmap.layer.imageTile.MapTileLayer
+tiles.prettyName=World Map
+# StandardMapTileFactory can be used if tiles stored locally
+#tiles.tileFactory=com.bbn.openmap.dataAccess.mapTile.StandardMapTileFactory
+# Would define root directory of tiles
+#tiles.rootDir=tiles
+tiles.fileExt=.png
+
+# Can also define server
+tiles.tileFactory=com.bbn.openmap.dataAccess.mapTile.ServerMapTileFactory
+# Don't abuse this server!
+tiles.rootDir=http://tah.openstreetmap.org/Tiles/tile
+# Store tiles locally, to reduce load on server
+tiles.localCacheRootDir=/data/tiles/osmtiles
+
+# What to do about empty tiles for bottom-most layer?  Set 
+# up handler. Saves disk space for tile storage. Usually 
+# only applies for homegrown tile sets. Upper tile layers 
+# will probably want to have nothing set for handler, so no tiles are clear
+tiles.emptyTileHandler=com.bbn.openmap.dataAccess.mapTile.ShpFileEmptyTileHandler
+# Define ocean/background colors for tiles
+tiles.background.fillColor=FFFFFF
+tiles.background.lineColor=FFFFFF
+# Define land color for tiles (empty tiles on land, too)
+tiles.land.fillColor=DECD8B
+tiles.land.lineColor=DECD8B
+# Define zoom level to limit handler response - zoom in past this provides empty coverage (clear)
+tiles.noCoverageZoom=13
+# Use shape file to determine which tiles are over land.
+tiles.shpFile=data/shape/cntry02/cntry02.shp

src/openmap/build.xml

@@ -113,7 +113,9 @@
 	Build the documentation.
 	############################ -->
 	<target name="docs.openmap" depends="init.openmap" description="Make the javadoc API html documents.">
-		<javadoc sourcepath="${openmap.src}:${openmap.src_ext}" destdir="${openmap.docs}/api" maxmemory="256m" excludepackagenames="**unimplemented**" packagenames="com.bbn.openmap.*, Acme.*, dopplet.*, edu.*" author="true" version="true" use="true" windowtitle="OpenMap API" doctitle="OpenMap" bottom="Copyright (C) BBNT Solutions LLC; See http://openmap.bbn.com/ for details" />
+		<javadoc sourcepath="${openmap.src}:${openmap.src_ext}" destdir="${openmap.docs}/api" maxmemory="256m" excludepackagenames="**unimplemented**" packagenames="com.bbn.openmap.*, Acme.*, dopplet.*, edu.*" author="true" version="true" use="true" windowtitle="OpenMap API" doctitle="OpenMap" bottom="Copyright (C) BBNT Solutions LLC; See http://openmap.bbn.com/ for details">
+			<classpath refid="ext_tools_classpath" />
+		</javadoc>
 	</target>
 
 	<!--  ############################