Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1

Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Change-Id: I123674540179ec5fd35a953cb652f613a3400ed5

Former-commit-id: 9f821c69fc8c198fc44529e2e00ecaa13b286e6f

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

@@ -133,6 +133,7 @@ import com.raytheon.viz.avnconfig.TafSiteData;
 import com.raytheon.viz.core.mode.CAVEMode;
 import com.raytheon.viz.texteditor.TextDisplayModel;
 import com.raytheon.viz.texteditor.msgs.IAviationObserver;
+import com.raytheon.viz.texteditor.util.AviationTextUtility;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
 import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
@@ -250,6 +251,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
  * 10/23/2015   18061       zhao        Fixed a bug in checkBaiscSyntaxError() 
  * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
  * Dec 09, 2015 4645        skorolev    Initiated wrapChk using ResourceTag. Removed popup menu persistance.
+ * Jan 07, 2016 4860        skorolev    Initiated TextDisplayModel at start of dialog.
  * 
  * </pre>
  * 
@@ -568,6 +570,9 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
         this.stationList = stationList;
 
         setText("AvnFPS TAF Editor");
+        // Initiate TextDisplayModel
+        TextDisplayModel.getInstance().setTextAviation(
+                new AviationTextUtility());
         SimulatedTime.getSystemTime().addSimulatedTimeChangeListener(this);
     }
 

edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml

@@ -2426,7 +2426,11 @@ F  | 1.8 |-459.67| 4 |    |   |..|8000F0FF| | 0 | 5
      <parameter>MxT6hr</parameter>    
      <parameter>MxT12hr</parameter>  
      <parameter>MnT12hr</parameter>   
-      <singleLevel units="SURFACE"></singleLevel>       
+     <singleLevel units="SURFACE"></singleLevel>
+     <rangeLevel units="HEIGHT_AGL">
+         <upper>10</upper>
+         <lower>0</lower>
+     </rangeLevel>
   </paramLevelMatches>
   <contourStyle>
      <displayUnits>F</displayUnits>    

edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

@@ -3040,6 +3040,10 @@
 			<parameter>MxT12hr</parameter>
 			<parameter>MnT12hr</parameter>
 			<singleLevel units="SURFACE"></singleLevel>
+            <rangeLevel units="HEIGHT_AGL">
+                <upper>10</upper>
+                <lower>0</lower>
+            </rangeLevel>
 		</paramLevelMatches>
 		<imageStyle>
 			<displayUnits>F</displayUnits>

edexOsgi/com.raytheon.uf.edex.plugin.ffmp/utility/common_static/base/ffmp/FFMPSourceConfig.xml

@@ -147,6 +147,7 @@
         <interpolatedGuidanceTransition>true</interpolatedGuidanceTransition>
         <conversion>0.03937</conversion>
         <mosaic>true</mosaic>
+        <guidanceType>RFC</guidanceType>
         <sourceFamily>RFCFFG</sourceFamily>
     </source>
     <!-- ARI sources -->