svn commit: r1840254 - in /ofbiz/ofbiz-framework/trunk/framework/common/data: GeoData_MX.xml GeoData_NR.xml GeoData_PA.xml GeoData_PK.xml GeoData_QA.xml GeoData_TG.xml GeoData_TJ.xml GeoData_UG.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1840254 - in /ofbiz/ofbiz-framework/trunk/framework/common/data: GeoData_MX.xml GeoData_NR.xml GeoData_PA.xml GeoData_PK.xml GeoData_QA.xml GeoData_TG.xml GeoData_TJ.xml GeoData_UG.xml

jleroux@apache.org
Author: jleroux
Date: Thu Sep  6 17:56:01 2018
New Revision: 1840254

URL: http://svn.apache.org/viewvc?rev=1840254&view=rev
Log:
Improved: Update Geo information according to ISO notifications
(OFBIZ-10028)

This follows this discussion http://markmail.org/message/xn7f552qvtpua2uq

It updates
MX <https://www.iso.org/obp/ui/#iso:code:3166:MX> 2017-11-23 /Mexico/
and adds
NR <https://www.iso.org/obp/ui/#iso:code:3166:NR> 2017-11-23 /Nauru/
PA <https://www.iso.org/obp/ui/#iso:code:3166:PA> 2017-11-23 /Panama/
PK <https://www.iso.org/obp/ui/#iso:code:3166:PK> 2017-11-23 /Pakistan/
QA <https://www.iso.org/obp/ui/#iso:code:3166:QA> 2017-11-23 /Qatar/
TG <https://www.iso.org/obp/ui/#iso:code:3166:TG> 2017-11-23 /Togo/
TJ <https://www.iso.org/obp/ui/#iso:code:3166:TJ> 2017-11-23 /Tajikistan/
UG <https://www.iso.org/obp/ui/#iso:code:3166:UG> 2017-11-23 /Uganda/

Thanks: Kyra Pritzel-Hentley for doing all the work!

Added:
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml   (with props)
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml   (with props)
Modified:
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_MX.xml

Modified: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_MX.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_MX.xml?rev=1840254&r1=1840253&r2=1840254&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_MX.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_MX.xml Thu Sep  6 17:56:01 2018
@@ -25,16 +25,16 @@ under the License.
     <Geo abbreviation="CAM" geoCode="CAM" geoId="MX-CM" geoName="Campeche" geoTypeId="STATE"/>
     <Geo abbreviation="CHP" geoCode="CHP" geoId="MX-CP" geoName="Chiapas" geoTypeId="STATE"/>
     <Geo abbreviation="CHH" geoCode="CHH" geoId="MX-CH" geoName="Chihuahua" geoTypeId="STATE"/>
-    <Geo abbreviation="COA" geoCode="COA" geoId="MX-CA" geoName="Coahuila" geoTypeId="STATE"/>
+    <Geo abbreviation="CMX" geoCode="CMX" geoId="MX-CX" geoName="Ciudad de México" geoTypeId="COUNTY"/>
+    <Geo abbreviation="COA" geoCode="COA" geoId="MX-CA" geoName="Coahuila de Zaragoza" geoTypeId="STATE"/>
     <Geo abbreviation="COL" geoCode="COL" geoId="MX-CL" geoName="Colima" geoTypeId="STATE"/>
-    <Geo abbreviation="DIF" geoCode="DIF" geoId="MX-DF" geoName="Distrito Federal" geoTypeId="STATE"/>
     <Geo abbreviation="DUR" geoCode="DUR" geoId="MX-DU" geoName="Durango" geoTypeId="STATE"/>
     <Geo abbreviation="GUA" geoCode="GUA" geoId="MX-GJ" geoName="Guanajuato" geoTypeId="STATE"/>
     <Geo abbreviation="GRO" geoCode="GRO" geoId="MX-GR" geoName="Guerrero" geoTypeId="STATE"/>
     <Geo abbreviation="HID" geoCode="HID" geoId="MX-HI" geoName="Hidalgo" geoTypeId="STATE"/>
     <Geo abbreviation="JAL" geoCode="JAL" geoId="MX-JA" geoName="Jalisco" geoTypeId="STATE"/>
     <Geo abbreviation="MEX" geoCode="MEX" geoId="MX-MX" geoName="México" geoTypeId="STATE"/>
-    <Geo abbreviation="MIC" geoCode="MIC" geoId="MX-MC" geoName="Michoacán" geoTypeId="STATE"/>
+    <Geo abbreviation="MIC" geoCode="MIC" geoId="MX-MC" geoName="Michoacán de Ocampo" geoTypeId="STATE"/>
     <Geo abbreviation="MOR" geoCode="MOR" geoId="MX-MR" geoName="Morelos" geoTypeId="STATE"/>
     <Geo abbreviation="NAY" geoCode="NAY" geoId="MX-NA" geoName="Nayarit" geoTypeId="STATE"/>
     <Geo abbreviation="NLE" geoCode="NLE" geoId="MX-NL" geoName="Nuevo León" geoTypeId="STATE"/>
@@ -48,7 +48,7 @@ under the License.
     <Geo abbreviation="TAB" geoCode="TAB" geoId="MX-TB" geoName="Tabasco" geoTypeId="STATE"/>
     <Geo abbreviation="TAM" geoCode="TAM" geoId="MX-TM" geoName="Tamaulipas" geoTypeId="STATE"/>
     <Geo abbreviation="TLA" geoCode="TLA" geoId="MX-TL" geoName="Tlaxcala" geoTypeId="STATE"/>
-    <Geo abbreviation="VER" geoCode="VER" geoId="MX-VE" geoName="Veracruz" geoTypeId="STATE"/>
+    <Geo abbreviation="VER" geoCode="VER" geoId="MX-VE" geoName="Veracruz de Ignacio de la Llave" geoTypeId="STATE"/>
     <Geo abbreviation="YUC" geoCode="YUC" geoId="MX-YU" geoName="Yucatán" geoTypeId="STATE"/>
     <Geo abbreviation="ZAC" geoCode="ZAC" geoId="MX-ZA" geoName="Zacatecas" geoTypeId="STATE"/>
 
@@ -58,9 +58,9 @@ under the License.
     <GeoAssoc geoId="MEX" geoIdTo="MX-CM" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-CP" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-CH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="MEX" geoIdTo="MX-CX" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-CA" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-CL" geoAssocTypeId="REGIONS"/>
-    <GeoAssoc geoId="MEX" geoIdTo="MX-DF" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-DU" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-GJ" geoAssocTypeId="REGIONS"/>
     <GeoAssoc geoId="MEX" geoIdTo="MX-GR" geoAssocTypeId="REGIONS"/>

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="AI" geoCode="01" geoId="NR-01" geoName="Aiwo" geoTypeId="COUNTY"/>
+    <Geo abbreviation="AB" geoCode="02" geoId="NR-02" geoName="Anabar" geoTypeId="COUNTY"/>
+    <Geo abbreviation="AT" geoCode="03" geoId="NR-03" geoName="Anetan" geoTypeId="COUNTY"/>
+    <Geo abbreviation="AR" geoCode="04" geoId="NR-04" geoName="Anibare" geoTypeId="COUNTY"/>
+    <Geo abbreviation="BA" geoCode="05" geoId="NR-05" geoName="Baitsi" geoTypeId="COUNTY"/>
+    <Geo abbreviation="BO" geoCode="06" geoId="NR-06" geoName="Boe" geoTypeId="COUNTY"/>
+    <Geo abbreviation="BU" geoCode="07" geoId="NR-07" geoName="Buada" geoTypeId="COUNTY"/>
+    <Geo abbreviation="DE" geoCode="08" geoId="NR-08" geoName="Denigomodu" geoTypeId="COUNTY"/>
+    <Geo abbreviation="EW" geoCode="09" geoId="NR-09" geoName="Ewa" geoTypeId="COUNTY"/>
+    <Geo abbreviation="IJ" geoCode="10" geoId="NR-10" geoName="Ijuw" geoTypeId="COUNTY"/>
+    <Geo abbreviation="ME" geoCode="11" geoId="NR-11" geoName="Meneng" geoTypeId="COUNTY"/>
+    <Geo abbreviation="NI" geoCode="12" geoId="NR-12" geoName="Nibok" geoTypeId="COUNTY"/>
+    <Geo abbreviation="UA" geoCode="13" geoId="NR-13" geoName="Uaboe" geoTypeId="COUNTY"/>
+    <Geo abbreviation="YA" geoCode="14" geoId="NR-14" geoName="Yaren" geoTypeId="COUNTY"/>
+    
+    <GeoAssoc geoId="NRU" geoIdTo="NR-01" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-02" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-03" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-04" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-05" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-06" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-07" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-08" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-09" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-10" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-11" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-12" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-13" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="NRU" geoIdTo="NR-14" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_NR.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="BC" geoCode="1" geoId="PA-1" geoName="Bocas del Toro" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="CH" geoCode="4" geoId="PA-4" geoName="Chiriquí" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="CC" geoCode="2" geoId="PA-2" geoName="Coclé" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="CL" geoCode="3" geoId="PA-3" geoName="Colón" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="DA" geoCode="5" geoId="PA-5" geoName="Darién" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="EM" geoCode="EM" geoId="PA-EM" geoName="Emberá" geoTypeId="REGION"/>
+    <Geo abbreviation="KY" geoCode="KY" geoId="PA-KY" geoName="Guna Yala" geoTypeId="REGION"/>
+    <Geo abbreviation="HE" geoCode="6" geoId="PA-6" geoName="Herrera" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="LS" geoCode="7" geoId="PA-7" geoName="Los Santos" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="NB" geoCode="NB" geoId="PA-NB" geoName="Ngöbe-Buglé" geoTypeId="REGION"/>
+    <Geo abbreviation="PM" geoCode="8" geoId="PA-8" geoName="Panamá" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="PO" geoCode="10" geoId="PA-10" geoName="Panamá Oeste" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="VR" geoCode="9" geoId="PA-9" geoName="Veraguas" geoTypeId="PROVINCE"/>
+    
+    <GeoAssoc geoId="PAN" geoIdTo="PA-1" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-4" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-2" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-3" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-5" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-EM" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-KY" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-6" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-7" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-NB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-8" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-10" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAN" geoIdTo="PA-9" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PA.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="JK" geoCode="JK" geoId="PK-JK" geoName="Azad Jammu and Kashmir" geoTypeId="TERRITORY"/>
+    <Geo abbreviation="BA" geoCode="BA" geoId="PK-BA" geoName="Balochistan" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="TA" geoCode="TA" geoId="PK-TA" geoName="Federally Administered Tribal Areas" geoTypeId="TERRITORY"/>
+    <Geo abbreviation="GB" geoCode="GB" geoId="PK-GB" geoName="Gilgit-Baltistan" geoTypeId="TERRITORY"/>
+    <Geo abbreviation="IS" geoCode="IS" geoId="PK-IS" geoName="Islamabad" geoTypeId="TERRITORY"/>
+    <Geo abbreviation="KP" geoCode="KP" geoId="PK-KP" geoName="Khyber Pakhtunkhwa" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="PB" geoCode="PB" geoId="PK-PB" geoName="Punjab" geoTypeId="PROVINCE"/>
+    <Geo abbreviation="SD" geoCode="SD" geoId="PK-SD" geoName="Sindh" geoTypeId="PROVINCE"/>
+    
+    <GeoAssoc geoId="PAK" geoIdTo="PK-JK" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-BA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-TA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-GB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-IS" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-KP" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-PB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="PAK" geoIdTo="PK-SD" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_PK.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="DA" geoCode="DA" geoId="QA-DA" geoName="Ad Dawḩah" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="KH" geoCode="KH" geoId="QA-KH" geoName="Al Khawr wa adh DhakhÄ«rah" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="WA" geoCode="WA" geoId="QA-WA" geoName="Al Wakrah" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="RA" geoCode="RA" geoId="QA-RA" geoName="Ar Rayyān" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="MS" geoCode="MS" geoId="QA-MS" geoName="Ash Shamāl" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="SH" geoCode="SH" geoId="QA-SH" geoName="Ash ShīḩānÄ«yah" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="ZA" geoCode="ZA" geoId="QA-ZA" geoName="Az̧ Z̧a‘āyin" geoTypeId="MUNICIPALITY"/>
+    <Geo abbreviation="US" geoCode="US" geoId="QA-US" geoName="Umm Şalāl" geoTypeId="MUNICIPALITY"/>
+    
+    <GeoAssoc geoId="QAT" geoIdTo="QA-DA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-KH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-WA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-RA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-MS" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-SH" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-ZA" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="QAT" geoIdTo="QA-US" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_QA.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="CE" geoCode="C" geoId="TG-C" geoName="Centrale" geoTypeId="REGION"/>
+    <Geo abbreviation="KA" geoCode="K" geoId="TG-K" geoName="Kara" geoTypeId="REGION"/>
+    <Geo abbreviation="MA" geoCode="M" geoId="TG-M" geoName="Maritime (Région)" geoTypeId="REGION"/>
+    <Geo abbreviation="PL" geoCode="P" geoId="TG-P" geoName="Plateaux" geoTypeId="REGION"/>
+    <Geo abbreviation="SA" geoCode="S" geoId="TG-S" geoName="Savanes" geoTypeId="REGION"/>
+    
+    <GeoAssoc geoId="TGO" geoIdTo="TG-C" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TGO" geoIdTo="TG-K" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TGO" geoIdTo="TG-M" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TGO" geoIdTo="TG-P" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TGO" geoIdTo="TG-S" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TG.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="DU" geoCode="DU" geoId="TJ-DU" geoName="Dushanbe" geoTypeId="TERRITORY"/>
+    <Geo abbreviation="KT" geoCode="KT" geoId="TJ-KT" geoName="Khatlon" geoTypeId="REGION"/>
+    <Geo abbreviation="GB" geoCode="GB" geoId="TJ-GB" geoName="KÅ­histoni Badakhshon" geoTypeId="REGION"/>
+    <Geo abbreviation="SU" geoCode="SU" geoId="TJ-SU" geoName="Sughd" geoTypeId="REGION"/>
+    <Geo abbreviation="RA" geoCode="RA" geoId="TJ-RA" geoName="Nohiyahoi Tobei Jumhurí" geoTypeId="COUNTY"/>
+    
+    <GeoAssoc geoId="TJK" geoIdTo="TJ-DU" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TJK" geoIdTo="TJ-KT" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TJK" geoIdTo="TJ-GB" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TJK" geoIdTo="TJ-SU" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="TJK" geoIdTo="TJ-RA" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_TJ.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml?rev=1840254&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml (added)
+++ ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml Thu Sep  6 17:56:01 2018
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entity-engine-xml>
+    <Geo abbreviation="C" geoCode="C" geoId="UG-C" geoName="Central" geoTypeId="REGION"/>
+    <Geo abbreviation="E" geoCode="E" geoId="UG-E" geoName="Eastern" geoTypeId="REGION"/>
+    <Geo abbreviation="N" geoCode="N" geoId="UG-N" geoName="Northern" geoTypeId="REGION"/>
+    <Geo abbreviation="W" geoCode="W" geoId="UG-W" geoName="Western" geoTypeId="REGION"/>
+    
+    <GeoAssoc geoId="UGA" geoIdTo="UG-C" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="UGA" geoIdTo="UG-E" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="UGA" geoIdTo="UG-N" geoAssocTypeId="REGIONS"/>
+    <GeoAssoc geoId="UGA" geoIdTo="UG-W" geoAssocTypeId="REGIONS"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_UG.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml