From 7d092536743849292d1d6b8861580b14d8f5432c Mon Sep 17 00:00:00 2001
From: "Daniel.Huffman" <Daniel.Huffman@noaa.gov>
Date: Tue, 26 Aug 2014 13:24:09 +0000
Subject: [PATCH 1/2] ASM #16715 - Reverted and augmented Cities.xml

Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0

Former-commit-id: e2e132e7a50fb749e3c787945aac7cda36dcae69 [formerly 8962a069be7fd9a5ec772bed8837a09ddb6c9272] [formerly d1cd90b487093a9774952ac0086d3ae6ebfcb1fa [formerly 2107976bd25c429521d4df7a92a3726a38806ba3]]
Former-commit-id: d1cd90b487093a9774952ac0086d3ae6ebfcb1fa
Former-commit-id: 64672eb47802ac260e3837ce72ad6b4932f9f01c
---
 .../localization/bundles/maps/Cities.xml      | 56 +++++--------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
index a6c0b21089..525d44f264 100644
--- a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
+++ b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
@@ -2,19 +2,19 @@
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
+
         U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
         This_software_product_contains_export-restricted_data_whose
         export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
         to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
         an_export_license_or_other_authorization.
-        
+
         Contractor_Name:________Raytheon_Company
         Contractor_Address:_____6825_Pine_Street,_Suite_340
         ________________________Mail_Stop_B8
         ________________________Omaha,_NE_68106
         ________________________402.291.0100
-        
+
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
@@ -26,50 +26,20 @@
                     <loadProperties>
                         <capabilities>
                             <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="pointCapability" pointStyle="NONE" />
-                            <capability xsi:type="labelableCapability" labelField="id" />
-                            <capability xsi:type="magnificationCapability" magnification="1.0" />
-                            <capability xsi:type="densityCapability" density="1.0" />
+                            <capability xsi:type="labelableCapability" labelField="name" />
+                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
+                                outlineWidth="1" />
                         </capabilities>
                         <resourceType>PLAN_VIEW</resourceType>
                     </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="mapResourceGroupData">
-                        <resource>
-                            <loadProperties>
-                                <capabilities>
-                                    <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                                    <capability xsi:type="labelableCapability" labelField="name" />
-                                </capabilities>
-                                <resourceType>PLAN_VIEW</resourceType>
-                            </loadProperties>
-                            <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false" isVisible="true">
-                                <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                            </properties>
-                            <resourceData xsi:type="lpiResourceData">
-                                <filename>cities.lpi</filename>
-                                <mapName>Cities</mapName>
-                            </resourceData>
-                        </resource>
+                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
+                        isVisible="true">
+                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
+                    </properties>
+                    <resourceData xsi:type="dbPointMapResourceData">
+                        <goodnessField>prog_disc</goodnessField>
+                                                <table>mapdata.city</table>
                         <mapName>Cities</mapName>
-                        <resource>
-                            <loadProperties>
-                                <capabilities>
-                                    <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                                    <capability xsi:type="labelableCapability" labelField="name" />
-                                        outlineWidth="1" />
-                                </capabilities>
-                                <resourceType>PLAN_VIEW</resourceType>
-                            </loadProperties>
-                            <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                                isVisible="true">
-                                <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                            </properties>
-                            <resourceData xsi:type="dbPointMapResourceData">
-                                <table>mapdata.city</table>
-                                <mapName>Cities</mapName>
-                            </resourceData>
-                        </resource>
                     </resourceData>
                 </resource>
             </descriptor>

From eb9b743c469f628a3cd6daa7ab5496f29a4855ce Mon Sep 17 00:00:00 2001
From: "Daniel.Huffman" <Daniel.Huffman@noaa.gov>
Date: Thu, 28 Aug 2014 17:20:30 +0000
Subject: [PATCH 2/2] ASM #16715 - Reverted and augmented Airports.xml and
 Fix.xml

Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: c3731d56220331b083f485e001df31f2dae02d16 [formerly c89a7169b04d5e1dc70d61a3bbe30d1aeb2c81e4] [formerly ca2aa8811b28e393a873a043b1d479b1cd9550cd [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]
Former-commit-id: ca2aa8811b28e393a873a043b1d479b1cd9550cd
Former-commit-id: dc2bc16bcc56309d0ffa5d0311ebc841666b88eb
---
 .../bundles/maps/FAA/Airports.xml             | 32 -----------------
 .../localization/bundles/maps/FAA/Fix.xml     | 34 -------------------
 2 files changed, 66 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
index f76d3207ae..579e5ccbcc 100644
--- a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
+++ b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
@@ -22,35 +22,6 @@
     <displayList>
         <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="mapResourceGroupData">
-                        <resource>
-                            <loadProperties>
-                                <capabilities>
-                                    <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                        outlineWidth="1" />
-                                    <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                                    <capability xsi:type="labelableCapability" labelField="name"/>
-                                </capabilities>
-                                <resourceType>PLAN_VIEW</resourceType>
-                            </loadProperties>
-                            <properties isSystemResource="false" isBlinking="false" isMapLayer="true"
-                                isHoverOn="false" isVisible="true">
-                                <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                            </properties>
-                            <resourceData xsi:type="dbPointMapResourceData">
-                                <table>mapdata.airport</table>
-                                <mapName>Airports</mapName>
-                            </resourceData>
-                        </resource>
                         <resource>
                             <loadProperties>
                                 <capabilities>
@@ -66,9 +37,6 @@
                             <resourceData xsi:type="lpiResourceData">
                                 <filename>airport.lpi</filename>
                                 <mapName>Airports</mapName>
-                            </resourceData>
-                        </resource>
-                        <mapName>Airports</mapName>
                     </resourceData>
                 </resource>
             </descriptor>
diff --git a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
index b4cab44690..9db555024b 100644
--- a/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
+++ b/cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
@@ -22,37 +22,6 @@
     <displayList>
         <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true" />
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false" isVisible="true" />
-                    <resourceData xsi:type="mapResourceGroupData">
-                        <resource>
-                            <loadProperties>
-                                <capabilities>
-                                    <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                        outlineWidth="1" />
-                                    <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                                    <capability xsi:type="pointCapability" pointStyle="NONE"/>
-                                    <capability xsi:type="labelableCapability" labelField="id"/>
-                                </capabilities>
-                                <resourceType>PLAN_VIEW</resourceType>
-                            </loadProperties>
-                            <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                                isVisible="true">
-                                <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                            </properties>
-                            <resourceData xsi:type="dbPointMapResourceData">
-                                <table>mapdata.fix</table>
-                                <mapName>Fixes/Intersections</mapName>
-                                <constraint>type != 'NU'</constraint>
-                            </resourceData>
-                        </resource>
                         <resource>
                             <loadProperties>
                                 <capabilities>
@@ -70,9 +39,6 @@
                                 <mapName>Fixes/Intersections</mapName>
                             </resourceData>
                         </resource>
-                        <mapName>Fixes/Intersections</mapName>
-                    </resourceData>
-                </resource>
             </descriptor>
         </displays>
     </displayList>