Merge branch 'unidata_18.2.1' into unidata_18.2.1-osx

.github/workflows/deploy_docs.yml

@@ -27,8 +27,8 @@ jobs:
 
       - name: Create mkdocs_requirements.txt
         run: |
-          echo "mkdocs==0.17.5" >> mkdocs_requirements.txt
-          echo "mkdocs-unidata==1.5.7" >> mkdocs_requirements.txt
+          echo "mkdocs" >> mkdocs_requirements.txt
+          echo "mkdocs-unidata" >> mkdocs_requirements.txt
           echo "fontawesome_markdown" >> mkdocs_requirements.txt
 
       - name: Get pip cache dir

.github/workflows/update_NDM.yml

@@ -0,0 +1,38 @@
+name: update station info
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 6 * * *" 
+
+jobs:
+  update_ndm:
+    runs-on: ubuntu-latest
+    environment:
+      name: VLAB
+    steps:
+      # Checkout this repo
+      # this gets the latest code (and is run on the default branch)
+      - name: Checkout awips2
+        uses: actions/checkout@v3
+      # Do individual pulls for all the files in the ndm directory
+      - name: Pull latest from vlab svn repo
+        run: |
+          cd rpms/awips2.edex/Installer.edex/ndm/
+          for file in *; do
+            svn export --force https://vlab.noaa.gov/svn/awips-ndm/trunk/"$file" --username ${{ secrets.VLAB_UNAME }} --password ${{ secrets.VLAB_PASS }}
+          done
+      # Check in all the new files
+      # Only do a git add/commit/push if files have changed
+      - name: Update existing NDM files for awips2 repo
+        run: |
+          date=`date +%Y%m%d-%H:%M:%S`
+          git config user.name $GITHUB_ACTOR
+          git config user.email $GITHUB_ACTOR@users.noreply.github.com
+          change=`git diff`
+          if [[ ! -z "$change" ]]
+          then
+            git add --all
+            git commit -m "New NDM updates on $date - autogenerated" 
+            git push
+          fi

awips_install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -f
+#!/bin/bash
 # about:  AWIPS install manager
 # devorg: Unidata Program Center
 # author: Michael James
@@ -403,54 +403,158 @@ function check_remove_edex {
   done
 }
 
-function remove_edex {
-  while true; do
-    read -p "`echo $'\n'`We want to back up some configuration files. What location do you want your files backed up to?
-        If you choose not to back up files (you will lose all your configurations) type \"no\"`echo $'\n> '`" backup_dir
+function calcLogSpace {
+  a=("$@")
+  logDiskspace=0
+  for path in "${a[@]}" ; do
+    if [ -d $path ] || [ -f $path ]; then
+      out=`du -sk $path | cut -f1`
+      logDiskspace=$((logDiskspace + $out))
+    fi
+  done
+  logDiskspace=$(echo "scale=8;$logDiskspace*.000000953674316" | bc)
+}
 
-    backup_dir=$(echo $backup_dir | tr '[:upper:]' '[:lower:]')
-    if [ $backup_dir = "no" ] || [ $backup_dir = "n" ]; then
+function calcConfigSpace {
+  a=("$@")
+  configDiskspace=0
+  for path in "${a[@]}" ; do
+    if [ -d $path ] || [ -f $path ]; then
+      out=`du -sk $path | cut -f1`
+      configDiskspace=$((configDiskspace + $out))
+    fi
+  done
+  configDiskspace=$(echo "scale=8;$configDiskspace*.000000953674316" | bc)
+}
+
+function backupLogs {
+  a=("$@")
+  log_backup_dir=${backup_dir}/awips2_backup_${ver}_${date}/logs
+
+  if [[ ! -d ${log_backup_dir} ]]; then
+    mkdir -p ${log_backup_dir}
+  fi
+  echo "Backing up to $log_backup_dir"
+  for path in "${a[@]}" ; do
+    if [ -d $path ] || [ -f $path ]; then
+      rsync -apR $path $log_backup_dir
+    fi
+  done
+}
+
+function backupConfigs {
+
+  a=("$@")
+  config_backup_dir=${backup_dir}/awips2_backup_${ver}_${date}/configs
+
+  if [[ ! -d $config_backup_dir ]]; then
+        mkdir -p $config_backup_dir
+      fi
+  echo "Backing up to $config_backup_dir"
+  for path in "${a[@]}" ; do
+    if [ -d $path ] || [ -f $path ]; then
+      rsync -apR $path $config_backup_dir
+    fi
+  done
+}
+
+function remove_edex {
+  logPaths=("/awips2/edex/logs" "/awips2/httpd_pypies/var/log/httpd/" "/awips2/database/data/pg_log/" "/awips2/qpid/log/" "/awips2/ldm/logs/")
+  configPaths=("/awips2/database/data/pg_hba*conf" "/awips2/edex/data/utility" "/awips2/edex/bin" "/awips2/ldm/etc" "/awips2/ldm/dev" "/awips2/edex/conf" "/awips2/edex/etc" "/usr/bin/edex" "/etc/init*d/edexServiceList" "/var/spool/cron/awips")
+
+  while true; do
+    read -p "`echo $'\n'`Please make a selction for what you would like backed up. If you choose not to back up files you will lose all your configurations:
+1. logs
+2. configs
+3. both logs and configs
+4. none
+`echo $'\n> '`" backup_ans
+
+#User chooses to back of files
+    if [[ $backup_ans =~ [1-3] ]]; then
+      echo "ANSWER: $backup_ans"
+      while true; do 
+        read -p "`echo $'\n'`What location do you want your files backed up to? `echo $'\n> '`" backup_dir
+
+        if [ ! -d $backup_dir ]; then
+          echo "$backup_dir does not exist, enter a path that exists"
+        else
+          #Check to see if user has enough space to backup
+          backupspace=`df -k --output=avail "$backup_dir" | tail -n1`
+          backupspace=$(echo "scale=8;$backupspace*.000000953674316" | bc)
+          date=$(date +'%Y%m%d-%H:%M:%S')
+       
+          echo "Checking to see which version of AWIPS is installed..."   
+          rpm=`rpm -qa | grep awips2-[12]`
+          IFS='-' str=(${rpm})
+          IFS=. str2=(${str[2]})
+          vers="${str[1]}-${str2[0]}"
+          ver="${vers//[.]/-}"
+
+          if [ $backup_ans = 1 ]; then
+            calcLogSpace "${logPaths[@]}"
+            #Don't let user backup data if there isn't enough space
+            if (( $(echo "$logDiskspace > $backupspace" | bc ) )); then
+              printf "You do not have enough disk space to backup this data to $backup_dir. You only have %.2f GB free and need %.2f GB.\n" $backupspace $logDiskspace
+            #Backup logs
+            else 
+              backupLogs "${logPaths[@]}"
+              printf "%.2f GB of logs were backed up to $backup_dir \n" "$logDiskspace"
+            fi
+          elif [ $backup_ans = 2 ]; then
+            calcConfigSpace "${configPaths[@]}"
+            #Don't let user backup data if there isn't enough space
+            if (( $(echo "$configDiskspace > $backupspace" | bc ) )); then
+              printf "You do not have enough disk space to backup this data to $backup_dir. You only have %.2f GB free and need %.2f GB.\n" $backupspace $configDiskspace
+            #Backup logs
+            else
+              backupConfigs "${configPaths[@]}"
+              printf "%.2f GB of configs were backed up to $backup_dir \n" "$configDiskspace"
+            fi
+          elif [ $backup_ans = 3 ]; then
+            calcLogSpace "${logPaths[@]}"
+            calcConfigSpace "${configPaths[@]}"
+            configLogDiskspace=$( echo "$logDiskspace+$configDiskspace" | bc)
+            #Don't let user backup data if there isn't enough space
+            if (( $(echo "$configLogDiskspace > $backupspace" | bc ) )); then
+               printf "You do not have enough disk space to backup this data to $backup_dir . You only have %.2f GB free and need %.2f GB.\n" $backupspace $configLogDiskspace
+            #Backup logs
+            else
+              backupLogs "${logPaths[@]}"
+              backupConfigs "${configPaths[@]}"
+              printf "%.2f GB of logs and configs were backed up to $backup_dir \n" "$configLogDiskspace"
+            fi
+          fi 
+          break
+        fi
+      done
+      break
+#User chooses not to back up any files
+    elif [ $backup_ans = 4 ]; then
         while true; do
-          read -p "`echo $'\n'`Are you sure you don't want to back up any AWIPS configuraiton files? Type \"yes\" to confirm or \"quit\" to exit` echo $'\n> '`" answer
+          read -p "`echo $'\n'`Are you sure you don't want to back up any AWIPS configuration or log files? Type \"yes\" to confirm, \"no\" to select a different backup option, or \"quit\" to exit` echo $'\n> '`" answer
           answer=$(echo $answer | tr '[:upper:]' '[:lower:]')
           if [ $answer = yes ] || [ $answer = y ]; then
             break 2 ;
           elif [ $answer = quit ] || [ $answer = q ]; then
             exit;
-          else
-            echo "Please answer \"yes\" to confirm you don't want to back up any AWIPS configuraiton files or type \"quit\" to exit"
+          elif [ $answer = no ] || [ $answer = n ]; then
+            break
           fi
         done
-    elif [ ! -d $backup_dir ]; then
-      echo "$backup_dir does not exist, enter a path that exists"
-
-    else
-      date=$(date +'%Y%m%d-%H:%M:%S')
-      backup_dir=${backup_dir}/awips2_backup_${date}
-      echo "Backing up to $backup_dir"
-
-      if [ ! -d $backup_dir ]; then 
-        mkdir -p $backup_dir
-      fi    
-      rsync -aP /awips2/database/data/pg_hba.conf $backup_dir/
-      rsync -aP /awips2/edex/data/utility $backup_dir/
-      rsync -aP /awips2/edex/bin $backup_dir/
-      if [ ! -d $backup_dir/ldm ]; then
-        mkdir -p $backup_dir/ldm
-      fi
-      rsync -aP /awips2/ldm/etc $backup_dir/ldm/
-      rsync -aP /awips2/ldm/dev $backup_dir/ldm/
-      rsync -aP /awips2/dev $backup_dir/
-      rsync -aP /awips2/edex/conf $backup_dir/
-      rsync -aP /awips2/edex/etc $backup_dir/
-      rsync -aP /awips2/edex/logs $backup_dir/
-      rsync -aP /usr/bin/edex $backup_dir/
-      rsync -aP /etc/init.d/edexServiceList $backup_dir/init.d/
-      rsync -aP /var/spool/cron/awips $backup_dir/
-      break;
+#User did not make a valid selection
+    else 
+      echo "Please make a valid selection (1, 2, 3, or 4)"
     fi
   done
 
+  FILE="/opt/bin/logarchival/edex_upgrade.pl"
+
+  if test -f "$FILE"; then
+    echo "Running /opt/bin/logarchival/edex_upgrade.pl and logging to /home/awips/crons/logarchival/general"
+    /opt/bin/logarchival/edex_upgrade.pl >> /home/awips/crons/logarchival/general
+  fi
+
   if [[ $(rpm -qa | grep awips2-cave) ]]; then
     echo "CAVE is also installed, now removing EDEX and CAVE"
     pkill cave.sh
@@ -479,7 +583,8 @@ function remove_edex {
        ex. yum groups mark remove 'AWIPS EDEX Server'"
      exit
   else
-    for dir in $(ls /awips2/); do
+    awips2_dirs=("data" "database" "data_store" "edex" "hdf5" "httpd_pypies" "java" "ldm" "postgres" "psql" "pypies" "python" "qpid" "tmp" "tools" "yajsw")
+    for dir in ${awips2_dirs[@]}; do
       if [ $dir != dev ] && [ $dir != cave ] ; then
         echo "Removing /awips2/$dir"
         rm -rf /awips2/$dir
@@ -525,36 +630,49 @@ function cave_prep {
  rm -rf /home/awips/caveData 
 }
 
+function cleanup {
+  sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/awips2.repo
+  if $alterReg; then
+    sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
+  fi
+  if $disableNDM; then
+    disable_ndm_update
+  fi
+  echo "$k has finished installing, the install log can be found in /tmp/awips-install.log"
+}
+
 if [ $# -eq 0 ]; then
   key="-h"
 else
   key="$1"
 fi
+
+disableNDM=true
+alterReg=true
+
 case $key in
     --cave)
         cave_prep
         yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/awips-install.log
-        echo "CAVE has finished installing, the install log can be found in /tmp/awips-install.log"
+        alterReg=false
+        disableNDM=false
+        k="CAVE"
         ;;
     --server|--edex)
         server_prep
         yum groupinstall awips2-server -y 2>&1 | tee -a /tmp/awips-install.log
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX server has finished installing, the install log can be found in /tmp/awips-install.log"
+        disableNDM=false
+        k="EDEX server"
         ;;
     --database)
         server_prep
         yum groupinstall awips2-database -y 2>&1 | tee -a /tmp/awips-install.log
-        disable_ndm_update
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX database has finished installing, the install log can be found in /tmp/awips-install.log"
+        k="EDEX database"
         ;;
     --ingest)
         server_prep
         yum groupinstall awips2-ingest -y 2>&1 | tee -a /tmp/awips-install.log
-        disable_ndm_update
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX ingest has finished installing, the install log can be found in /tmp/awips-install.log"
+        k="EDEX ingest"
         ;;
     -h|--help)
         echo -e $usage
@@ -562,6 +680,8 @@ case $key in
         ;;
 esac
 
+cleanup
+
 PATH=$PATH:/awips2/edex/bin/
 exit
 

build/buildEnvironment.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Version
 export AWIPSII_VERSION="18.2.1"
-export AWIPSII_RELEASE="5"
+export AWIPSII_RELEASE="6"
 # Author
 export AWIPSII_BUILD_VENDOR="UCAR"
 export AWIPSII_BUILD_SITE="Unidata"

cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml

@@ -26,5 +26,6 @@
     <include installTo="menu:upperAir?before=RADAR" fileName="menus/upperair/baseUpperAir.xml" />
     <include installTo="menu:upperAir?after=RADAR" fileName="menus/upperair/baseRadar.xml" />
     <include subMenu="MDCRS plots" installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/baseMDCRS.xml" />
+    <include subMenu="PIREP plots" installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/basePirep.xml" />
     <include installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/baseAviation.xml" />
 </menuContributionFile>

cave/com.raytheon.uf.viz.d2d.ui/plugin.xml

@@ -559,25 +559,27 @@
                </visibleWhen>
             </command>
             </toolbar>
+            <toolbar
+                  id="warngenButton">
+               <command
+                     commandId="com.raytheon.viz.warngen.gui.WarngenAction"
+                     icon="icons/warngen.gif">
+                  <visibleWhen>
+                     <and>
+                        <reference
+                              definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                        </reference>
+                        <test
+                              args="WFO"
+                              forcePluginActivation="true"
+                              property="com.raytheon.viz.warngen.site.SiteMode">
+                        </test>
+                     </and>
+                  </visibleWhen>
+               </command>
+            </toolbar>
          <toolbar
                id="applications">
-            <command
-                  commandId="com.raytheon.viz.warngen.gui.WarngenAction"
-                  label="Warngen"
-                  mode="FORCE_TEXT">
-               <visibleWhen>
-                  <and>
-                     <reference
-                           definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
-                     </reference>
-                     <test
-                           args="WFO"
-                           forcePluginActivation="true"
-                           property="com.raytheon.viz.warngen.site.SiteMode">
-                     </test>
-                  </and>
-               </visibleWhen>
-            </command>
                	<command
                   commandId="com.raytheon.uf.viz.d2d.nsharp.dialog"
                   icon="icons/nsharp.png"

cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/time/dialogs/ValidTimeAndTimeResolutionDialog.java

@@ -36,7 +36,9 @@ import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.DataTimeComparator;
 import com.raytheon.uf.common.time.DataTime.FLAG;
+import com.raytheon.uf.common.time.DataTimeComparator.SortKey;
 import com.raytheon.uf.viz.core.comm.PerspectiveSpecificLoadProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
@@ -54,6 +56,8 @@ import com.raytheon.uf.viz.d2d.ui.time.formatter.TimeFormatter;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 15, 2009            bgonzale     Initial creation
+ * Apr 26, 2022       srcarter@unidata  Changed the order "valid" times are sorted.
+ *                                      Changed the resize behavior of the dialog.
  * 
  * </pre>
  * 
@@ -74,6 +78,8 @@ public class ValidTimeAndTimeResolutionDialog extends
     private List vTimeList;
 
     private List tResolutionList;
+    
+    private ArrayList<DataTime> sortedTimes;
 
     /*
      * Time resolutions in seconds calculated from the intrinsic period for the
@@ -121,6 +127,7 @@ public class ValidTimeAndTimeResolutionDialog extends
     protected void initializeComponents(Shell shell) {
         Composite mainComp = new Composite(shell, SWT.NONE);
         mainComp.setLayout(new GridLayout(2, false));
+        mainComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
         Label vTimeLabel = new Label(mainComp, SWT.NONE);
         vTimeLabel.setText("Valid Time:");
@@ -226,7 +233,7 @@ public class ValidTimeAndTimeResolutionDialog extends
         config.setForecast(new Long(dt.getFcstTime()));
         config.setDelta(getSelectedMillisecondsResolution());
 
-        if (cachedAvailableTimes != null && cachedAvailableTimes.length > 0) {
+        if (cachedAvailableTimes != null && cachedAvailableTimes.length > 0 && sortedTimes==null) {
             DataTime[] dataTimesArray = TimeMatcher.makeEmptyLoadList(
                     cachedAvailableTimes, calculatePreferredLatestTime(),
                     frameCount, loadMode, config.getForecast(),
@@ -246,19 +253,30 @@ public class ValidTimeAndTimeResolutionDialog extends
             vTimeList.removeAll();
             vTimeList.add("Default");
 
-            for (int i = cachedAvailableTimes.length - 1; i >= 0; --i) {
-                DataTime dataTime = cachedAvailableTimes[i];
+            //create a sorted list based on the ref time and then forecast hour
+            sortedTimes = new ArrayList<DataTime>();
+            for(DataTime dtime : cachedAvailableTimes){
+            	sortedTimes.add(dtime);
+            }
+            //use reverse forecast hour because we're going to display these in reverse order
+            // where the ref time is newest to oldest, and forecast is 
+            DataTimeComparator timeComp = new DataTimeComparator(SortKey.INITIAL_TIME, SortKey.REV_FORECAST_TIME, false);
+            Collections.sort(sortedTimes, timeComp);
+            
+            for(int i=sortedTimes.size()-1; i>-1; i--){
+            	DataTime dataTime = sortedTimes.get(i);
                 StringBuilder sb = new StringBuilder();
 
-                if (Collections.binarySearch(dataTimesList, dataTime) < 0) {
+                String hourStr = timeFormatter.getDayTimeForecastHRString(dataTime);
+                
+                //for all entries but the 0HR runs, add a preceeding "..."
+                if(!hourStr.contains(" 0HR")){
                     sb.append("...");
                 }
                 if (dataTime.getUtilityFlags().contains(FLAG.FCST_USED)) {
-                    sb.append(timeFormatter
-                            .getDayHourForecastHRString(dataTime));
+                    sb.append(timeFormatter.getDayHourForecastHRString(dataTime));
                 } else {
-                    sb.append(timeFormatter
-                            .getDayTimeForecastHRString(dataTime));
+                    sb.append(hourStr);
                 }
                 vTimeList.add(sb.toString());
             }

cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml

@@ -440,7 +440,7 @@
                                 <metadataMap>
                                     <mapping key="productCode">
                                         <constraint
-                                            constraintValue="155,28,29,30"
+                                            constraintValue="155,28,29,30,161,160"
                                             constraintType="IN" />
                                     </mapping>
                                     <mapping key="icao">

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_eeri.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="eeri"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="eeri"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqkw.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqkw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqkw"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqwa.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqwa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqwa"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabr.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabr"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kakq.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kakq"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kakq"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kama.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kama"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kama"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kamx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kamx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kamx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kapx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kapx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kapx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_karx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="karx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="karx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_katx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="katx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="katx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbbx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbbx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbgm.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbgm"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbgm"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbhx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbhx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbhx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbis.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbis"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbis"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbix.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbix"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kblx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kblx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kblx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbmx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbmx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbmx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbox.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbox"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbro.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbro"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbro"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbuf.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbuf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbuf"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbyx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbyx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcae.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcae"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcae"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbw.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbw"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kccx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kccx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kccx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcle.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcle"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcle"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kclx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kclx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kclx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcri.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcri"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcri"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcrp.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcrp"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcrp"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcxx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcxx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcxx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcys.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcys"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcys"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdax.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdax"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kddc.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kddc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kddc"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdfx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdfx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdfx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdgx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdgx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdix.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdix"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdlh.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdlh"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdlh"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdmx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdmx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdmx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdox.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdox"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdtx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdtx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdvn.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdvn"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdvn"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdyx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdyx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keax.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keax"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kemx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kemx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kemx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kenx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kenx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kenx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keox.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keox"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kepz.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kepz"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kepz"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kesx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kesx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kesx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kevx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kevx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kevx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kewx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kewx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kewx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keyx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keyx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfcx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfcx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfcx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdr.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdr"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kffc.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kffc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kffc"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsd.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsd"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsd"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kftg.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kftg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kftg"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfws.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfws"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfws"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kggw.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kggw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kggw"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgjx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgjx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgjx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgld.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgld"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgld"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrb.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrb"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrb"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrk.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrk"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrk"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrr.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrr"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgsp.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgsp"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgsp"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgwx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgwx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgyx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgyx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khdx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khdx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khdx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khgx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khgx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khnx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khnx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khnx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khpx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khpx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khpx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khtx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khtx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kict.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kict"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kict"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kicx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kicx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kicx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiln.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiln"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiln"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kilx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kilx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kilx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kind.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kind"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kind"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kinx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kinx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kinx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwa.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwa"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjax.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjax"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjgx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjgx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjkl.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjkl"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjkl"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klbb.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klbb"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klbb"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klch.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klch"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klch"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klgx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klgx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klix.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klix"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klnx.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klnx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klnx"/>

cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klot.xml

@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klot"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klot"/>