Merge branch 'unidata_16.4.1-ncep_osx' of github.com:Unidata/awips2 into unidata_16.4.1-ncep_osx

cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt

@@ -1,61 +0,0 @@
-# Warngen
-com.raytheon.viz.warngen
-# GFe Perspective
-com.raytheon.viz.gfe
-com.raytheon.viz.ghg
-# AvnFPS
-com.raytheon.viz.aviation
-com.raytheon.viz.avnconfig
-# MPE
-com.raytheon.viz.mpe
-com.raytheon.viz.mpe.ui
-# Hydro
-com.raytheon.viz.hydrobase
-com.raytheon.viz.hydrocommon
-com.raytheon.viz.hydro
-# ncep
-gov.noaa.nws.ncep.viz.ui.perspectives
-gov.noaa.nws.ncep.ui.nctextui
-gov.noaa.nws.ncep.viz.cloudHeight
-gov.noaa.nws.ncep.viz.rsc.airmet
-gov.noaa.nws.ncep.viz.rsc.atcf
-gov.noaa.nws.ncep.viz.rsc.convsigmet
-gov.noaa.nws.ncep.viz.rsc.ffa
-gov.noaa.nws.ncep.viz.rsc.ffg
-gov.noaa.nws.ncep.viz.rsc.idft
-gov.noaa.nws.ncep.viz.rsc.intlsig
-gov.noaa.nws.ncep.viz.rsc.lightning
-gov.noaa.nws.ncep.viz.rsc.mosaic
-gov.noaa.nws.ncep.viz.rsc.ncgrid
-gov.noaa.nws.ncep.viz.rsc.ncscat
-gov.noaa.nws.ncep.viz.rsc.nonconvsigmet
-gov.noaa.nws.ncep.viz.rsc.plotdata
-gov.noaa.nws.ncep.viz.rsc.satellite
-gov.noaa.nws.ncep.viz.rsc.svrl
-gov.noaa.nws.ncep.viz.rsc.warn
-gov.noaa.nws.ncep.viz.rsc.wcn
-gov.noaa.nws.ncep.viz.rsc.wcp
-gov.noaa.nws.ncep.viz.rsc.wstm
-gov.noaa.nws.ncep.viz.rsc.wou
-#localization
-com.raytheon.uf.viz.localization.perspective
-org.eclipse.wst.xml.ui
-com.python.pydev
-com.python.pydev.analysis
-com.python.pydev.codecompletion
-com.python.pydev.debug
-com.python.pydev.fastparser
-com.python.pydev.refactoring
-org.python.pydev
-org.python.pydev.ast
-org.python.pydev.core
-org.python.pydev.customizations
-org.python.pydev.debug
-org.python.pydev.django
-org.python.pydev.help
-org.python.pydev.jython
-org.python.pydev.parser
-org.python.pydev.refactoring
-org.python.pydev.shared_core
-org.python.pydev.shared_interactive_console
-org.python.pydev.shared_ui

cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml

@@ -50,6 +50,12 @@
         <substitute key="element" value="DAA"/>
         <substitute key="colormap" value="Radar/8-bit STP"/>
 		<substitute key="interpolate" value="true"/>
+    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
+		menuText="OHA - One-Hour Accumulation" id="OHA">
+        <substitute key="element" value="OHA"/>
+        <substitute key="colormap" value="Radar/8-bit STP"/>
+		<substitute key="interpolate" value="true"/>
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml" 
 		menuText="DTA - Storm-Total Precipitation" id="DTA">

docs/index.md

@@ -21,7 +21,7 @@
 
 AWIPS takes a unified approach to data ingest, and most data types follow a path through the system starting with an [LDM](#ldm) client requesting data from the [Unidata IDD](http://www.unidata.ucar.edu/projects/#idd). These data files are then decoded and stored as HDF5 and Postgres metadata by [EDEX](install/install-edex.html). 
 
-Unidata supports two visualization frameworks for rendering data: [CAVE](install/install-cave.html), and the Python Data Access Framework ([python-awips](http://python-awips.readthedocs.io)).
+Unidata develops and supports the visualization client for rendering data: [CAVE](install/install-cave.html), and the Python Data Access Framework ([python-awips](http://python-awips.readthedocs.io)) for remotely accessing AWIPS data as numpy arrays and Shapely geometries.
 
 ---
 

docs/install/install-edex.md

@@ -1,4 +1,4 @@
-# <i class="fa fa-linux"></i> EDEX for Linux 
+# <i class="fa fa-linux"></i> EDEX for CentOS/Red Hat
 
 [installEDEX.sh <i class="fa fa-download"></i>](http://www.unidata.ucar.edu/software/awips2/installEDEX.sh) 
 
@@ -246,7 +246,7 @@ To start *all services except the LDM* (good for troubleshooting):
 
 ---
 
-## Directories to know
+## Directories To Know
 
 * `/awips2` - Contains all of the installed AWIPS software. 
 * `/awips2/edex/logs` - EDEX logs.
@@ -258,4 +258,4 @@ To start *all services except the LDM* (good for troubleshooting):
 * `/awips2/ldm/etc` - Location of **ldmd.conf** and **pqact.conf**
 * `/awips2/ldm/logs` - LDM logs.
 * `/awips2/data_store` - Raw data store.
-* `/awips2/data_store/ingest` - Manual data ingest endpoint.
+* `/awips2/data_store/ingest` - Manual data ingest endpoint (as of 16.4.1, previously /awips2/edex/data/manual)

edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml

@@ -456,9 +456,9 @@
 	</paramLevelMatches>
 	<imageStyle>
 		<displayUnits>in</displayUnits>
-		<samplePrefs>
+                <samplePrefs>
-		    <!-- Number of decimal places to format the sample string to -->
+                  <minValue>0</minValue>
-			<formatString>4</formatString>
+                  <maxValue>12</maxValue>
 		</samplePrefs>
 		<defaultColormap>Radar/8-bit STP</defaultColormap>
         <dataMapping>
@@ -480,6 +480,36 @@
         </dataMapping>
 	</imageStyle>
 </styleRule>
+<styleRule>
+	<paramLevelMatches>
+		<parameter>OHA</parameter>
+	</paramLevelMatches>
+	<imageStyle>
+		<displayUnits>in</displayUnits>
+                <samplePrefs>
+                  <minValue>0</minValue>
+                  <maxValue>12</maxValue>
+		</samplePrefs>
+		<defaultColormap>Radar/OSF/Storm Total Precip</defaultColormap>
+        <dataMapping>
+                <entry displayValue='0' pixelValue='0'/>
+                <entry displayValue='.1' pixelValue='20'/>
+                <entry displayValue='.25' pixelValue='50'/>
+                <entry displayValue='.5' pixelValue='100'/>
+                <entry displayValue='1' pixelValue='111'/>
+                <entry displayValue='1.5' pixelValue='122'/>
+                <entry displayValue='2' pixelValue='133'/>
+                <entry displayValue='2.5' pixelValue='144'/>
+                <entry displayValue='3' pixelValue='155'/>
+                <entry displayValue='3.5' pixelValue='166'/>
+                <entry displayValue='4' pixelValue='177'/>
+                <entry displayValue='4.5' pixelValue='188'/>
+                <entry displayValue='5' pixelValue='200' />
+                <entry displayValue='10' pixelValue='239' />
+                <entry displayValue='12' pixelValue='255' />
+        </dataMapping>
+	</imageStyle>
+</styleRule>
 <styleRule>
 	<paramLevelMatches>
 		<parameter>NTP</parameter>
@@ -487,9 +517,9 @@
 	</paramLevelMatches>
 	<imageStyle>
 		<displayUnits>in</displayUnits>
-		<samplePrefs>
+                <samplePrefs>
-		    <!-- Number of decimal places to format the sample string to -->
+                  <minValue>0</minValue>
-			<formatString>4</formatString>
+                  <maxValue>24</maxValue>
 		</samplePrefs>
 		<defaultColormap>Radar/8-bit STP</defaultColormap>
         <dataMapping>

mkdocs.yml

@@ -32,15 +32,15 @@ pages:
 - CAVE User Manual:
     - D2D Perspective: cave/d2d-perspective.md
     - Maps, Views, Projections: cave/maps-views-projections.md
-#    - Bundles and Procedures: cave/bundles-and-procedures.md
+    - TODO Bundles and Procedures: cave/bundles-and-procedures.md
     - Localization Perspective: cave/localization-perspective.md
     - NCP Perspective: cave/ncp-perspective.md
     - NSHARP: cave/nsharp.md
     - WarnGen: cave/warngen.md
     - GIS and Shapefiles: cave/d2d-gis-shapefiles.md
     - Volume Browser: cave/d2d-gridded-models.md
-#    - Derived Parameters: cave/d2d-gridded-models.md
+    - TODO Derived Parameters: cave/d2d-gridded-models.md
-#    - GEMPAK Grid Display: cave/d2d-gridded-models.md
+    - TODO GEMPAK Grid Display: cave/d2d-gridded-models.md
     - Display Tools: cave/d2d-tools.md
     - Radar Tools: cave/d2d-radar-tools.md
     - Editing Menus: cave/d2d-edit-menus.md