Oops, an assumption was wrong in my previous emaim, there are no conflicts with California and Canada geoId (how could it be since it's the PK, idiot I'm)
So yes maybe it's simpler to revert all and forget about that forever?

Jacques

From: "Jacques Le Roux" <[email protected]>
I could provide a SQL script which removes the wrong entities, but it's the users responsability to update or not their own data. It
seems impossible to envision all possible cases

Jacques

From: "Jacques Le Roux" <[email protected]>
So we are forever stuck with wrong data? Consider Canada and California geoId, it's 
"CA" for both.
Actually this was more an effort for future systems to be consistent with ISO 3166-2 and 
sound ("CA" case).

This said I'm ready to revert r1169822 + r1169790, but I wonder then if we will 
never find a window to fix this data...
Should not better concerned systems update and fix data? Then maybe we could 
provide a mean for that?

Jacques

From: "David E Jones" <[email protected]>
Did you consider that changing this seed data will make ALL current production 
data that depends on this data suddenly break?

In fact for existing systems, by this change alone, you'll be adding new 
records and not modifying the existing records because
the PK (geoId) is being changed.

That's gonna screw up a lot of stuff. Please revert this and any commits done 
based on these changes.

-David


On Sep 12, 2011, at 8:50 AM, Jacques Le Roux wrote:

I have to take care about data for test and demo also...

Jacques

From: <[email protected]>
Author: jleroux
Date: Mon Sep 12 15:11:00 2011
New Revision: 1169790

URL: http://svn.apache.org/viewvc?rev=1169790&view=rev
Log:
Normalizes
* Canada GeoId for Province prefixed with CA- as it should be (following ISO 
3166-2:CA,
http://en.wikipedia.org/wiki/ISO_3166-2:CA)

* USA GeoId for Province prefixed with US- as it should be (following ISO 
3166-2:US,
http://en.wikipedia.org/wiki/ISO_3166-2:US). I did not see any reasons to no use the 
same scheme for "US Armed Forces
provinces"

No other countries had the same problem

Modified:
  ofbiz/trunk/framework/common/data/GeoData_CA.xml
  ofbiz/trunk/framework/common/data/GeoData_US.xml

Modified: ofbiz/trunk/framework/common/data/GeoData_CA.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_CA.xml?rev=1169790&r1=1169789&r2=1169790&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_CA.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_CA.xml Mon Sep 12 15:11:00 2011
@@ -19,33 +19,33 @@ under the License.
-->

<entity-engine-xml>
-    <Geo abbreviation="AB" geoCode="AB" geoId="AB" geoName="Alberta" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="BC" geoCode="BC" geoId="BC" geoName="British Columbia" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="MB" geoCode="MB" geoId="MB" geoName="Manitoba" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="NB" geoCode="NB" geoId="NB" geoName="New Brunswick" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="NL" geoCode="NL" geoId="NL" geoName="Newfoundland and Labrador" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="NS" geoCode="NS" geoId="NS" geoName="Nova Scotia" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="NT" geoCode="NT" geoId="NT" geoName="Northwest Territories" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="NU" geoCode="NU" geoId="NU" geoName="Nunavut" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward Island" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan" 
geoTypeId="PROVINCE"/>
-    <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="AB" geoCode="AB" geoId="CA-AB" geoName="Alberta" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="BC" geoCode="BC" geoId="CA-BC" geoName="British Columbia" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="MB" geoCode="MB" geoId="CA-MB" geoName="Manitoba" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NB" geoCode="NB" geoId="CA-NB" geoName="New Brunswick" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NL" geoCode="NL" geoId="CA-NL" geoName="Newfoundland and Labrador" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NS" geoCode="NS" geoId="CA-NS" geoName="Nova Scotia" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NT" geoCode="NT" geoId="CA-NT" geoName="Northwest Territories" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NU" geoCode="NU" geoId="CA-NU" geoName="Nunavut" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="ON" geoCode="ON" geoId="CA-ON" geoName="Ontario" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="PE" geoCode="PE" geoId="CA-PE" geoName="Prince Edward Island" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="QC" geoCode="QC" geoId="CA-QC" geoName="Quebec" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="SK" geoCode="SK" geoId="CA-SK" geoName="Saskatchewan" 
geoTypeId="PROVINCE"/>
+    <Geo abbreviation="YT" geoCode="YT" geoId="CA-YT" geoName="Yukon" 
geoTypeId="PROVINCE"/>

-    <GeoAssoc geoId="CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="AB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="NL" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="CA-CAN" geoIdTo="YT" geoAssocTypeId="REGIONS"/>

</entity-engine-xml>


Modified: ofbiz/trunk/framework/common/data/GeoData_US.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/GeoData_US.xml?rev=1169790&r1=1169789&r2=1169790&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/GeoData_US.xml (original)
+++ ofbiz/trunk/framework/common/data/GeoData_US.xml Mon Sep 12 15:11:00 2011
@@ -19,204 +19,204 @@ under the License.
-->

<entity-engine-xml>
-    <Geo abbreviation="AA" geoCode="AA" geoId="AA" geoName="Armed Forces Americas" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AE" geoCode="AE" geoId="AE" geoName="Armed Forces Europe" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AP" geoCode="AP" geoId="AP" geoName="Armed Forces Pacific" 
geoTypeId="STATE"/>
-
-    <Geo abbreviation="AK" geoCode="AK" geoId="AK" geoName="Alaska" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AL" geoCode="AL" geoId="AL" geoName="Alabama" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AR" geoCode="AR" geoId="AR" geoName="Arkansas" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AS" geoCode="AS" geoId="AS" geoName="American Samoa" 
geoTypeId="STATE"/>
-    <Geo abbreviation="AZ" geoCode="AZ" geoId="AZ" geoName="Arizona" 
geoTypeId="STATE"/>
-    <Geo abbreviation="CA" geoCode="CA" geoId="CA" geoName="California" 
geoTypeId="STATE"/>
-    <Geo abbreviation="CO" geoCode="CO" geoId="CO" geoName="Colorado" 
geoTypeId="STATE"/>
-    <Geo abbreviation="CT" geoCode="CT" geoId="CT" geoName="Connecticut" 
geoTypeId="STATE"/>
-    <Geo abbreviation="DC" geoCode="DC" geoId="DC" geoName="District of Columbia" 
geoTypeId="STATE"/>
-    <Geo abbreviation="DE" geoCode="DE" geoId="DE" geoName="Delaware" 
geoTypeId="STATE"/>
-    <Geo abbreviation="FL" geoCode="FL" geoId="FL" geoName="Florida" 
geoTypeId="STATE"/>
-    <Geo abbreviation="FM" geoCode="FM" geoId="FM" geoName="Federated States of Micronesia" 
geoTypeId="STATE"/>
-    <Geo abbreviation="GA" geoCode="GA" geoId="GA" geoName="Georgia" 
geoTypeId="STATE"/>
-    <Geo abbreviation="GU" geoCode="GU" geoId="GU" geoName="Guam" 
geoTypeId="STATE"/>
-    <Geo abbreviation="HI" geoCode="HI" geoId="HI" geoName="Hawaii" 
geoTypeId="STATE"/>
-    <Geo abbreviation="IA" geoCode="IA" geoId="IA" geoName="Iowa" 
geoTypeId="STATE"/>
-    <Geo abbreviation="ID" geoCode="ID" geoId="ID" geoName="Idaho" 
geoTypeId="STATE"/>
-    <Geo abbreviation="IL" geoCode="IL" geoId="IL" geoName="Illinois" 
geoTypeId="STATE"/>
-    <Geo abbreviation="IN" geoCode="IN" geoId="IN" geoName="Indiana" 
geoTypeId="STATE"/>
-    <Geo abbreviation="KS" geoCode="KS" geoId="KS" geoName="Kansas" 
geoTypeId="STATE"/>
-    <Geo abbreviation="KY" geoCode="KY" geoId="KY" geoName="Kentucky" 
geoTypeId="STATE"/>
-    <Geo abbreviation="LA" geoCode="LA" geoId="LA" geoName="Louisiana" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MA" geoCode="MA" geoId="MA" geoName="Massachusetts" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MD" geoCode="MD" geoId="MD" geoName="Maryland" 
geoTypeId="STATE"/>
-    <Geo abbreviation="ME" geoCode="ME" geoId="ME" geoName="Maine" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MH" geoCode="MH" geoId="MH" geoName="Marshall Islands" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MI" geoCode="MI" geoId="MI" geoName="Michigan" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MN" geoCode="MN" geoId="MN" geoName="Minnesota" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MP" geoCode="MP" geoId="MP" geoName="Northern Mariana Islands" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MO" geoCode="MO" geoId="MO" geoName="Missouri" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MS" geoCode="MS" geoId="MS" geoName="Mississippi" 
geoTypeId="STATE"/>
-    <Geo abbreviation="MT" geoCode="MT" geoId="MT" geoName="Montana" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NC" geoCode="NC" geoId="NC" geoName="North Carolina" 
geoTypeId="STATE"/>
-    <Geo abbreviation="ND" geoCode="ND" geoId="ND" geoName="North Dakota" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NE" geoCode="NE" geoId="NE" geoName="Nebraska" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NH" geoCode="NH" geoId="NH" geoName="New Hampshire" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NJ" geoCode="NJ" geoId="NJ" geoName="New Jersey" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NM" geoCode="NM" geoId="NM" geoName="New Mexico" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NV" geoCode="NV" geoId="NV" geoName="Nevada" 
geoTypeId="STATE"/>
-    <Geo abbreviation="NY" geoCode="NY" geoId="NY" geoName="New York" 
geoTypeId="STATE"/>
-    <Geo abbreviation="OH" geoCode="OH" geoId="OH" geoName="Ohio" 
geoTypeId="STATE"/>
-    <Geo abbreviation="OK" geoCode="OK" geoId="OK" geoName="Oklahoma" 
geoTypeId="STATE"/>
-    <Geo abbreviation="OR" geoCode="OR" geoId="OR" geoName="Oregon" 
geoTypeId="STATE"/>
-    <Geo abbreviation="PA" geoCode="PA" geoId="PA" geoName="Pennsylvania" 
geoTypeId="STATE"/>
-    <Geo abbreviation="PW" geoCode="PW" geoId="PW" geoName="Palau" 
geoTypeId="STATE"/>
-    <Geo abbreviation="PR" geoCode="PR" geoId="PR" geoName="Puerto Rico" 
geoTypeId="STATE"/>
-    <Geo abbreviation="RI" geoCode="RI" geoId="RI" geoName="Rhode Island" 
geoTypeId="STATE"/>
-    <Geo abbreviation="SC" geoCode="SC" geoId="SC" geoName="South Carolina" 
geoTypeId="STATE"/>
-    <Geo abbreviation="SD" geoCode="SD" geoId="SD" geoName="South Dakota" 
geoTypeId="STATE"/>
-    <Geo abbreviation="TN" geoCode="TN" geoId="TN" geoName="Tennessee" 
geoTypeId="STATE"/>
-    <Geo abbreviation="TX" geoCode="TX" geoId="TX" geoName="Texas" 
geoTypeId="STATE"/>
-    <Geo abbreviation="UM" geoCode="UM" geoId="UM" geoName="U.S. Minor Outlying Islands" 
geoTypeId="STATE"/>
-    <Geo abbreviation="UT" geoCode="UT" geoId="UT" geoName="Utah" 
geoTypeId="STATE"/>
-    <Geo abbreviation="VA" geoCode="VA" geoId="VA" geoName="Virginia" 
geoTypeId="STATE"/>
-    <Geo abbreviation="VT" geoCode="VT" geoId="VT" geoName="Vermont" 
geoTypeId="STATE"/>
-    <Geo abbreviation="WA" geoCode="WA" geoId="WA" geoName="Washington" 
geoTypeId="STATE"/>
-    <Geo abbreviation="WI" geoCode="WI" geoId="WI" geoName="Wisconsin" 
geoTypeId="STATE"/>
-    <Geo abbreviation="WV" geoCode="WV" geoId="WV" geoName="West Virginia" 
geoTypeId="STATE"/>
-    <Geo abbreviation="WY" geoCode="WY" geoId="WY" geoName="Wyoming" 
geoTypeId="STATE"/>
-    <Geo abbreviation="VI" geoCode="VI" geoId="VI" geoName="Virgin Islands" 
geoTypeId="STATE"/>
-
-    <GeoAssoc geoId="USA" geoIdTo="AK" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="AL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="AR" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="AZ" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="CA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="CO" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="CT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="DC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="DE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="FL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="GA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="GU" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="HI" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="IA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="ID" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="IL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="IN" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="KS" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="KY" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="LA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MD" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="ME" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MI" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MN" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MO" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MS" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="ND" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NH" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NJ" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NM" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NV" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NY" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="OH" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="OK" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="OR" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="PA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="PR" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="RI" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="SC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="SD" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="TN" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="TX" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="UT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="VA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="VT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="WA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="WI" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="WV" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="WY" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="VI" geoAssocTypeId="REGIONS"/>
-
-    <GeoAssoc geoId="USA" geoIdTo="AA" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="AE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="AP" geoAssocTypeId="REGIONS"/>
+    <Geo abbreviation="AA" geoCode="AA" geoId="US-AA" geoName="Armed Forces Americas" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AE" geoCode="AE" geoId="US-AE" geoName="Armed Forces Europe" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AP" geoCode="AP" geoId="US-AP" geoName="Armed Forces Pacific" 
geoTypeId="STATE"/>
+
+    <Geo abbreviation="AK" geoCode="AK" geoId="US-AK" geoName="Alaska" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AL" geoCode="AL" geoId="US-AL" geoName="Alabama" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AR" geoCode="AR" geoId="US-AR" geoName="Arkansas" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AS" geoCode="AS" geoId="US-AS" geoName="American Samoa" 
geoTypeId="STATE"/>
+    <Geo abbreviation="AZ" geoCode="AZ" geoId="US-AZ" geoName="Arizona" 
geoTypeId="STATE"/>
+    <Geo abbreviation="CA" geoCode="CA" geoId="US-CA" geoName="California" 
geoTypeId="STATE"/>
+    <Geo abbreviation="CO" geoCode="CO" geoId="US-CO" geoName="Colorado" 
geoTypeId="STATE"/>
+    <Geo abbreviation="CT" geoCode="CT" geoId="US-CT" geoName="Connecticut" 
geoTypeId="STATE"/>
+    <Geo abbreviation="DC" geoCode="DC" geoId="US-DC" geoName="District of Columbia" 
geoTypeId="STATE"/>
+    <Geo abbreviation="DE" geoCode="DE" geoId="US-DE" geoName="Delaware" 
geoTypeId="STATE"/>
+    <Geo abbreviation="FL" geoCode="FL" geoId="US-FL" geoName="Florida" 
geoTypeId="STATE"/>
+    <Geo abbreviation="FM" geoCode="FM" geoId="US-FM" geoName="Federated States of 
Micronesia" geoTypeId="STATE"/>
+    <Geo abbreviation="GA" geoCode="GA" geoId="US-GA" geoName="Georgia" 
geoTypeId="STATE"/>
+    <Geo abbreviation="GU" geoCode="GU" geoId="US-GU" geoName="Guam" 
geoTypeId="STATE"/>
+    <Geo abbreviation="HI" geoCode="HI" geoId="US-HI" geoName="Hawaii" 
geoTypeId="STATE"/>
+    <Geo abbreviation="IA" geoCode="IA" geoId="US-IA" geoName="Iowa" 
geoTypeId="STATE"/>
+    <Geo abbreviation="ID" geoCode="ID" geoId="US-ID" geoName="Idaho" 
geoTypeId="STATE"/>
+    <Geo abbreviation="IL" geoCode="IL" geoId="US-IL" geoName="Illinois" 
geoTypeId="STATE"/>
+    <Geo abbreviation="IN" geoCode="IN" geoId="US-IN" geoName="Indiana" 
geoTypeId="STATE"/>
+    <Geo abbreviation="KS" geoCode="KS" geoId="US-KS" geoName="Kansas" 
geoTypeId="STATE"/>
+    <Geo abbreviation="KY" geoCode="KY" geoId="US-KY" geoName="Kentucky" 
geoTypeId="STATE"/>
+    <Geo abbreviation="LA" geoCode="LA" geoId="US-LA" geoName="Louisiana" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MA" geoCode="MA" geoId="US-MA" geoName="Massachusetts" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MD" geoCode="MD" geoId="US-MD" geoName="Maryland" 
geoTypeId="STATE"/>
+    <Geo abbreviation="ME" geoCode="ME" geoId="US-ME" geoName="Maine" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MH" geoCode="MH" geoId="US-MH" geoName="Marshall Islands" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MI" geoCode="MI" geoId="US-MI" geoName="Michigan" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MN" geoCode="MN" geoId="US-MN" geoName="Minnesota" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MP" geoCode="MP" geoId="US-MP" geoName="Northern Mariana Islands" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MO" geoCode="MO" geoId="US-MO" geoName="Missouri" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MS" geoCode="MS" geoId="US-MS" geoName="Mississippi" 
geoTypeId="STATE"/>
+    <Geo abbreviation="MT" geoCode="MT" geoId="US-MT" geoName="Montana" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NC" geoCode="NC" geoId="US-NC" geoName="North Carolina" 
geoTypeId="STATE"/>
+    <Geo abbreviation="ND" geoCode="ND" geoId="US-ND" geoName="North Dakota" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NE" geoCode="NE" geoId="US-NE" geoName="Nebraska" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NH" geoCode="NH" geoId="US-NH" geoName="New Hampshire" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NJ" geoCode="NJ" geoId="US-NJ" geoName="New Jersey" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NM" geoCode="NM" geoId="US-NM" geoName="New Mexico" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NV" geoCode="NV" geoId="US-NV" geoName="Nevada" 
geoTypeId="STATE"/>
+    <Geo abbreviation="NY" geoCode="NY" geoId="US-NY" geoName="New York" 
geoTypeId="STATE"/>
+    <Geo abbreviation="OH" geoCode="OH" geoId="US-OH" geoName="Ohio" 
geoTypeId="STATE"/>
+    <Geo abbreviation="OK" geoCode="OK" geoId="US-OK" geoName="Oklahoma" 
geoTypeId="STATE"/>
+    <Geo abbreviation="OR" geoCode="OR" geoId="US-OR" geoName="Oregon" 
geoTypeId="STATE"/>
+    <Geo abbreviation="PA" geoCode="PA" geoId="US-PA" geoName="Pennsylvania" 
geoTypeId="STATE"/>
+    <Geo abbreviation="PW" geoCode="PW" geoId="US-PW" geoName="Palau" 
geoTypeId="STATE"/>
+    <Geo abbreviation="PR" geoCode="PR" geoId="US-PR" geoName="Puerto Rico" 
geoTypeId="STATE"/>
+    <Geo abbreviation="RI" geoCode="RI" geoId="US-RI" geoName="Rhode Island" 
geoTypeId="STATE"/>
+    <Geo abbreviation="SC" geoCode="SC" geoId="US-SC" geoName="South Carolina" 
geoTypeId="STATE"/>
+    <Geo abbreviation="SD" geoCode="SD" geoId="US-SD" geoName="South Dakota" 
geoTypeId="STATE"/>
+    <Geo abbreviation="TN" geoCode="TN" geoId="US-TN" geoName="Tennessee" 
geoTypeId="STATE"/>
+    <Geo abbreviation="TX" geoCode="TX" geoId="US-TX" geoName="Texas" 
geoTypeId="STATE"/>
+    <Geo abbreviation="UM" geoCode="UM" geoId="US-UM" geoName="U.S. Minor Outlying Islands" 
geoTypeId="STATE"/>
+    <Geo abbreviation="UT" geoCode="UT" geoId="US-UT" geoName="Utah" 
geoTypeId="STATE"/>
+    <Geo abbreviation="VA" geoCode="VA" geoId="US-VA" geoName="Virginia" 
geoTypeId="STATE"/>
+    <Geo abbreviation="VT" geoCode="VT" geoId="US-VT" geoName="Vermont" 
geoTypeId="STATE"/>
+    <Geo abbreviation="WA" geoCode="WA" geoId="US-WA" geoName="Washington" 
geoTypeId="STATE"/>
+    <Geo abbreviation="WI" geoCode="WI" geoId="US-WI" geoName="Wisconsin" 
geoTypeId="STATE"/>
+    <Geo abbreviation="WV" geoCode="WV" geoId="US-WV" geoName="West Virginia" 
geoTypeId="STATE"/>
+    <Geo abbreviation="WY" geoCode="WY" geoId="US-WY" geoName="Wyoming" 
geoTypeId="STATE"/>
+    <Geo abbreviation="VI" geoCode="VI" geoId="US-VI" geoName="Virgin Islands" 
geoTypeId="STATE"/>
+
+    <GeoAssoc geoId="USA" geoIdTo="US-AK" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-AL" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-AR" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-AZ" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-CA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-CO" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-CT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-DC" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-DE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-FL" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-GA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-GU" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-HI" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-IA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-ID" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-IL" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-IN" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-KS" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-KY" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-LA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MD" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-ME" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MI" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MN" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MO" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MS" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-MT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NC" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-ND" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NJ" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NM" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NV" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-NY" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-OH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-OK" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-OR" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-PA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-PR" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-RI" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-SC" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-SD" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-TN" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-TX" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-UT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-VA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-VT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-WA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-WI" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-WV" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-WY" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-VI" geoAssocTypeId="REGIONS"/>
+
+    <GeoAssoc geoId="USA" geoIdTo="US-AA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-AE" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="USA" geoIdTo="US-AP" geoAssocTypeId="REGIONS"/>

   <Geo abbreviation="USAF" geoCode="USAF" geoId="USAF" geoName="US Armed Forces" 
geoTypeId="GROUP"/>
-    <GeoAssoc geoId="AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="AP" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AA" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AE" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AP" geoIdTo="USAF" geoAssocTypeId="GROUP_MEMBER"/>

   <Geo abbreviation="AKHI" geoCode="AKHI" geoId="AKHI" geoName="Alaska/Hawaii" 
geoTypeId="GROUP"/>
-    <GeoAssoc geoId="AK" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="HI" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AK" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-HI" geoIdTo="AKHI" geoAssocTypeId="GROUP_MEMBER"/>

   <Geo abbreviation="USTR" geoCode="USTR" geoId="USTR" geoName="US Territories" 
geoTypeId="GROUP"/>
-    <GeoAssoc geoId="AS" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="FM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="GU" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MH" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MP" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="PW" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="PR" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="UM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="VI" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AS" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-FM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-GU" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MH" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MP" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-PW" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-PR" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-UM" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-VI" geoIdTo="USTR" geoAssocTypeId="GROUP_MEMBER"/>

   <Geo abbreviation="AHUST" geoCode="AHUST" geoId="AHUST" 
geoName="Alaska/Hawaii/Territories" geoTypeId="GROUP"/>
   <GeoAssoc geoId="AKHI" geoIdTo="AHUST" geoAssocTypeId="GROUP_MEMBER"/>
   <GeoAssoc geoId="USTR" geoIdTo="AHUST" geoAssocTypeId="GROUP_MEMBER"/>

   <Geo abbreviation="USCN" geoCode="USCN" geoId="USCN" geoName="US Continental" 
geoTypeId="GROUP"/>
-    <GeoAssoc geoId="AL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="AR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="AZ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="CA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="CO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="CT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="DC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="DE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="FL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="GA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="IA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="ID" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="IL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="IN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="KS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="KY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="LA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="ME" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="MT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="ND" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NJ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NM" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="NY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="OH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="OK" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="OR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="PA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="RI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="SC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="SD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="TN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="TX" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="UT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="VA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="VT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="WA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="WI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="WV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
-    <GeoAssoc geoId="WY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-AZ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-CA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-CO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-CT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-DC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-DE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-FL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-GA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-IA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-ID" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-IL" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-IN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-KS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-KY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-LA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-ME" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MO" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MS" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-MT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-ND" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NE" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NJ" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NM" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-NY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-OH" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-OK" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-OR" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-PA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-RI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-SC" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-SD" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-TN" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-TX" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-UT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-VA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-VT" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-WA" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-WI" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-WV" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>
+    <GeoAssoc geoId="US-WY" geoIdTo="USCN" geoAssocTypeId="GROUP_MEMBER"/>

   <Geo abbreviation="USALL" geoCode="USALL" geoId="USALL" geoName="US All (w/ APO/FPO)" 
geoTypeId="GROUP"/>
   <GeoAssoc geoId="USCN" geoIdTo="USALL" geoAssocTypeId="GROUP_MEMBER"/>










Reply via email to