Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
Locked
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
 
Administrator
|
I have to take care about data for test and demo also...
Jacques From: <[hidden email]> > 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"/> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
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: <[hidden email]> >> 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"/> >> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
Administrator
|
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" <[hidden email]> > 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: <[hidden email]> >>> 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"/> >>> >> >> > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
Administrator
|
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" <[hidden email]> > 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" <[hidden email]> >> 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: <[hidden email]> >>>> 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"/> >>>> >>> >>> >> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
Administrator
|
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" <[hidden email]> >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" <[hidden email]> >> 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" <[hidden email]> >>> 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: <[hidden email]> >>>>> 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"/> >>>>> >>>> >>>> >>> >> >> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
Administrator
|
I'm still waiting before reverting, I'd like to have other opinions on this
Thanks Jacques From: "Jacques Le Roux" <[hidden email]> > 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" <[hidden email]> >>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" <[hidden email]> >>> 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" <[hidden email]> >>>> 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: <[hidden email]> >>>>>> 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"/> >>>>>> >>>>> >>>>> >>>> >>> >>> >> >> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
|
Yes, there is no conflict currently because countries are using the 3-letter ISO code, and the USA states (the first states we had data for, way back in 2001, had just the 2-letter state abbreviation; later states had a country prefix and then a state abbreviation as the US states really should have originally). So anyway yes, Canada is geoId="CAN" and California is geoId="CA". So yes, I'm even more for reverting this change. -David On Sep 12, 2011, at 2:03 PM, Jacques Le Roux wrote: > I'm still waiting before reverting, I'd like to have other opinions on this > > Thanks > > Jacques > > From: "Jacques Le Roux" <[hidden email]> >> 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" <[hidden email]> >>> 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" <[hidden email]> >>>> 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" <[hidden email]> >>>>> 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: <[hidden email]> >>>>>>> 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"/> >>>>>>> >>>>>> >>>>>> >>>>> >>>> >>>> >>> >>> >> > > |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
|
I don't understand why it matters what the geoId is. Surely they could
be 10000, 10001 etc and it wouldn't matter, *as long as they never change* (because they are PK). In the UI it *should* be the geoCode or the abbreviation or the geoName that is displayed, depending on context. I know in some places in the UI the geoId is currently displayed, but I consider this a strange choice by the coder of the UI code, and nothing to do with the data in the Geo. In our local UI, we've changed that to display either the abbreviation or geoName or geoCode instead. So -1 for this change. Cheers, Anne. On 13 September 2011 08:30, David E Jones <[hidden email]> wrote: > > Yes, there is no conflict currently because countries are using the 3-letter ISO code, and the USA states (the first states we had data for, way back in 2001, had just the 2-letter state abbreviation; later states had a country prefix and then a state abbreviation as the US states really should have originally). So anyway yes, Canada is geoId="CAN" and California is geoId="CA". > > So yes, I'm even more for reverting this change. > > -David > > > On Sep 12, 2011, at 2:03 PM, Jacques Le Roux wrote: > >> I'm still waiting before reverting, I'd like to have other opinions on this >> >> Thanks >> >> Jacques >> >> From: "Jacques Le Roux" <[hidden email]> >>> 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" <[hidden email]> >>>> 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" <[hidden email]> >>>>> 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" <[hidden email]> >>>>>> 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: <[hidden email]> >>>>>>>> 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"/> >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>> >>>>> >>>> >>>> >>> >> >> > > -- Coherent Software Australia Pty Ltd PO Box 2773 Cheltenham Vic 3192 Phone: (03) 9585 6788 Fax: (03) 9585 1086 Web: http://www.cohsoft.com.au/ Email: [hidden email] Bonsai ERP, the all-inclusive ERP system http://www.bonsaierp.com.au/ |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
|
Anne, Yes, you're right that the PK is effectively arbitrary and the only reason to keep the current values is because they've been in use for a decade in hundreds of different systems. -David On Sep 12, 2011, at 5:25 PM, Anne wrote: > I don't understand why it matters what the geoId is. Surely they could > be 10000, 10001 etc and it wouldn't matter, *as long as they never > change* (because they are PK). > > In the UI it *should* be the geoCode or the abbreviation or the > geoName that is displayed, depending on context. I know in some places > in the UI the geoId is currently displayed, but I consider this a > strange choice by the coder of the UI code, and nothing to do with the > data in the Geo. In our local UI, we've changed that to display either > the abbreviation or geoName or geoCode instead. > > So -1 for this change. > > Cheers, > Anne. > > On 13 September 2011 08:30, David E Jones <[hidden email]> wrote: >> >> Yes, there is no conflict currently because countries are using the 3-letter ISO code, and the USA states (the first states we had data for, way back in 2001, had just the 2-letter state abbreviation; later states had a country prefix and then a state abbreviation as the US states really should have originally). So anyway yes, Canada is geoId="CAN" and California is geoId="CA". >> >> So yes, I'm even more for reverting this change. >> >> -David >> >> >> On Sep 12, 2011, at 2:03 PM, Jacques Le Roux wrote: >> >>> I'm still waiting before reverting, I'd like to have other opinions on this >>> >>> Thanks >>> >>> Jacques >>> >>> From: "Jacques Le Roux" <[hidden email]> >>>> 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" <[hidden email]> >>>>> 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" <[hidden email]> >>>>>> 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" <[hidden email]> >>>>>>> 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: <[hidden email]> >>>>>>>>> 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"/> >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>>> >>>>> >>>>> >>>> >>> >>> >> >> > > > > -- > Coherent Software Australia Pty Ltd > PO Box 2773 > Cheltenham Vic 3192 > Phone: (03) 9585 6788 > Fax: (03) 9585 1086 > Web: http://www.cohsoft.com.au/ > Email: [hidden email] > > Bonsai ERP, the all-inclusive ERP system > http://www.bonsaierp.com.au/ |
Re: svn commit: r1169790 - in /ofbiz/trunk/framework/common/
|
Administrator
|
In reply to this post by Anne Jessel
Agreed, reverted at revision: 1170061
My almost pathologic consistency need is sometimes amazing... Jacques From: "Anne" <[hidden email]> >I don't understand why it matters what the geoId is. Surely they could > be 10000, 10001 etc and it wouldn't matter, *as long as they never > change* (because they are PK). > > In the UI it *should* be the geoCode or the abbreviation or the > geoName that is displayed, depending on context. I know in some places > in the UI the geoId is currently displayed, but I consider this a > strange choice by the coder of the UI code, and nothing to do with the > data in the Geo. In our local UI, we've changed that to display either > the abbreviation or geoName or geoCode instead. > > So -1 for this change. > > Cheers, > Anne. > > On 13 September 2011 08:30, David E Jones <[hidden email]> wrote: >> >> Yes, there is no conflict currently because countries are using the 3-letter ISO code, and the USA states (the first states we >> had data for, way back in 2001, had just the 2-letter state abbreviation; later states had a country prefix and then a state >> abbreviation as the US states really should have originally). So anyway yes, Canada is geoId="CAN" and California is geoId="CA". >> >> So yes, I'm even more for reverting this change. >> >> -David >> >> >> On Sep 12, 2011, at 2:03 PM, Jacques Le Roux wrote: >> >>> I'm still waiting before reverting, I'd like to have other opinions on this >>> >>> Thanks >>> >>> Jacques >>> >>> From: "Jacques Le Roux" <[hidden email]> >>>> 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" <[hidden email]> >>>>> 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" <[hidden email]> >>>>>> 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" <[hidden email]> >>>>>>> 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: <[hidden email]> >>>>>>>>> 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"/> >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>>> >>>>> >>>>> >>>> >>> >>> >> >> > > > > -- > Coherent Software Australia Pty Ltd > PO Box 2773 > Cheltenham Vic 3192 > Phone: (03) 9585 6788 > Fax: (03) 9585 1086 > Web: http://www.cohsoft.com.au/ > Email: [hidden email] > > Bonsai ERP, the all-inclusive ERP system > http://www.bonsaierp.com.au/ > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |