[OFBiz] SVN: r4955 - trunk/framework/common/data

jonesde at svn.ofbiz.org jonesde at svn.ofbiz.org
Wed May 4 12:56:56 EDT 2005 

Author: jonesde
Date: 2005-05-04 11:56:52 -0500 (Wed, 04 May 2005)
New Revision: 4955

Modified:
   trunk/framework/common/data/GeoData.xml
   trunk/framework/common/data/GeoData_US.xml
Log:
Applied changes from Kosta Firsov: corrects some spelling, updated ISO codes, moves Canada provinces to Canada instead of being in the US geo group; 
also a couple of cleanups

Modified: trunk/framework/common/data/GeoData.xml
===================================================================
--- trunk/framework/common/data/GeoData.xml	2005-05-04 15:47:42 UTC (rev 4954)
+++ trunk/framework/common/data/GeoData.xml	2005-05-04 16:56:52 UTC (rev 4955)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-engine-xml>
+    <!-- Based on: ISO 3166 http://www.iso.org/iso/en/prods-services/iso3166ma/index.html -->
+    <Geo abbreviation="_NA_"geoCode="_NA_" geoId="_NA_" geoName="Not Applicable"/>
     <Geo abbreviation="IRQ" geoCode="IQ" geoId="IRQ" geoName="Iraq" geoSecCode="368" geoTypeId="COUNTRY"/>
     <Geo abbreviation="NIU" geoCode="NU" geoId="NIU" geoName="Niue" geoSecCode="570" geoTypeId="COUNTRY"/>
     <Geo abbreviation="CAN" geoCode="CA" geoId="CAN" geoName="Canada" geoSecCode="124" geoTypeId="COUNTRY"/>
@@ -177,11 +179,11 @@
     <Geo abbreviation="POL" geoCode="PL" geoId="POL" geoName="Poland" geoSecCode="616" geoTypeId="COUNTRY"/>
     <Geo abbreviation="PRT" geoCode="PT" geoId="PRT" geoName="Portugal" geoSecCode="620" geoTypeId="COUNTRY"/>
     <Geo abbreviation="GNB" geoCode="GW" geoId="GNB" geoName="Guinea-bissau" geoSecCode="624" geoTypeId="COUNTRY"/>
-    <Geo abbreviation="TMP" geoCode="TP" geoId="TMP" geoName="East Timor" geoSecCode="626" geoTypeId="COUNTRY"/>
+    <Geo abbreviation="TLS" geoCode="TL" geoId="TLS" geoName="East Timor" geoSecCode="626" geoTypeId="COUNTRY"/>
     <Geo abbreviation="PRI" geoCode="PR" geoId="PRI" geoName="Puerto Rico" geoSecCode="630" geoTypeId="COUNTRY"/>
     <Geo abbreviation="QAT" geoCode="QA" geoId="QAT" geoName="Qatar" geoSecCode="634" geoTypeId="COUNTRY"/>
     <Geo abbreviation="REU" geoCode="RE" geoId="REU" geoName="Reunion" geoSecCode="638" geoTypeId="COUNTRY"/>
-    <Geo abbreviation="ROM" geoCode="RO" geoId="ROM" geoName="Romania" geoSecCode="642" geoTypeId="COUNTRY"/>
+    <Geo abbreviation="ROU" geoCode="RO" geoId="ROU" geoName="Romania" geoSecCode="642" geoTypeId="COUNTRY"/>
     <Geo abbreviation="RUS" geoCode="RU" geoId="RUS" geoName="Russian Federation" geoSecCode="643" geoTypeId="COUNTRY"/>
     <Geo abbreviation="RWA" geoCode="RW" geoId="RWA" geoName="Rwanda" geoSecCode="646" geoTypeId="COUNTRY"/>
     <Geo abbreviation="SHN" geoCode="SH" geoId="SHN" geoName="St. Helena" geoSecCode="654" geoTypeId="COUNTRY"/>
@@ -313,3 +315,4 @@
       <GeoAssoc geoId="GBR" geoIdTo="Wts" geoAssocTypeId="REGIONS" />
     -->
 </entity-engine-xml>
+

Modified: trunk/framework/common/data/GeoData_US.xml
===================================================================
--- trunk/framework/common/data/GeoData_US.xml	2005-05-04 15:47:42 UTC (rev 4954)
+++ trunk/framework/common/data/GeoData_US.xml	2005-05-04 16:56:52 UTC (rev 4955)
@@ -25,7 +25,7 @@
     <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="Louisianna" 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"/>
@@ -75,7 +75,7 @@
     <Geo abbreviation="ON" geoCode="ON" geoId="ON" geoName="Ontario" geoTypeId="STATE"/>
     <Geo abbreviation="PE" geoCode="PE" geoId="PE" geoName="Prince Edward Island" geoTypeId="STATE"/>
     <Geo abbreviation="QC" geoCode="QC" geoId="QC" geoName="Quebec" geoTypeId="STATE"/>
-    <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Sasakatchewan" geoTypeId="STATE"/>
+    <Geo abbreviation="SK" geoCode="SK" geoId="SK" geoName="Saskatchewan" geoTypeId="STATE"/>
     <Geo abbreviation="YT" geoCode="YT" geoId="YT" geoName="Yukon" geoTypeId="STATE"/>
 
     <Geo abbreviation="USAF" geoCode="USAF" geoId="USAF" geoName="US Armed Forces" geoTypeId="GROUP"/>
@@ -221,17 +221,18 @@
     <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="AB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="BC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="MB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NB" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NF" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NS" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NT" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="NU" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="ON" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="PE" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="QC" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="SK" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="USA" geoIdTo="YT" geoAssocTypeId="REGIONS"/>
+    <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="NF" 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"/>
 </entity-engine-xml>
+

More information about the Svn mailing list