Author: deepak
Date: Thu Jun 15 08:24:06 2017
New Revision: 1798798
URL: http://svn.apache.org/viewvc?rev=1798798&view=rev
Log:
Applied fix from trunk for revision: 1798796
===
Improved: Updated Geo data for India (OFBIZ-9406)
India has 29 states and 7 Union Territory. Need to update data as in data Union
Territory also added as STATE,
used TERRITORY as GeoTypeId for Union Territories.
Applied patch from jira issue
- Updated geoTypeId for 7 union territory from STATE to TERRITORY
- Update geoName for Andaman And Nicobar it should be Andaman and Nicobar
Islands
- Corrected geoName and gooId and other detail for Delhi union territory
- Corrected to the name for Jammu and Kashmir (And should be in lower camel
case)
- Corrected name for Odisha (Orissa>> Odisha)
- Corrected geoName for Puducherry, also added wellKnownText = "Pondicherry"
- Corrected geoName for Tamil Nadu (Tamilnadu >> Tamil Nadu)
- Added data for new state Telangana
- Corrected geoName for Uttarakhand (Uttaranchal >> Uttarakhand)
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 15 08:24:06 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml?rev=1798798&r1=1798797&r2=1798798&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml (original)
+++ ofbiz/branches/release16.11/framework/common/data/GeoData_IN.xml Thu Jun 15
08:24:06 2017
@@ -19,40 +19,41 @@ under the License.
-->
<entity-engine-xml>
- <Geo abbreviation="AN" geoCode="AN" geoId="IN-AN" geoName="Andaman And
Nicobar" geoTypeId="STATE"/>
+ <Geo abbreviation="AN" geoCode="AN" geoId="IN-AN" geoName="Andaman and
Nicobar Islands" geoTypeId="TERRITORY"/>
<Geo abbreviation="AP" geoCode="AP" geoId="IN-AP" geoName="Andhra Pradesh"
geoTypeId="STATE"/>
<Geo abbreviation="AR" geoCode="AR" geoId="IN-AR" geoName="Arunachal
Pradesh" geoTypeId="STATE"/>
<Geo abbreviation="AS" geoCode="AS" geoId="IN-AS" geoName="Assam"
geoTypeId="STATE"/>
<Geo abbreviation="BR" geoCode="BR" geoId="IN-BR" geoName="Bihar"
geoTypeId="STATE"/>
- <Geo abbreviation="CH" geoCode="CH" geoId="IN-CH" geoName="Chandigarh"
geoTypeId="STATE"/>
+ <Geo abbreviation="CH" geoCode="CH" geoId="IN-CH" geoName="Chandigarh"
geoTypeId="TERRITORY"/>
<Geo abbreviation="CT" geoCode="CT" geoId="IN-CT" geoName="Chhattisgarh"
geoTypeId="STATE"/>
- <Geo abbreviation="DN" geoCode="DN" geoId="IN-DN" geoName="Dadra And Nager
Haveli" geoTypeId="STATE"/>
- <Geo abbreviation="DD" geoCode="DD" geoId="IN-DD" geoName="Daman And Diu"
geoTypeId="STATE"/>
+ <Geo abbreviation="DN" geoCode="DN" geoId="IN-DN" geoName="Dadra and Nagar
Haveli" geoTypeId="TERRITORY"/>
+ <Geo abbreviation="DD" geoCode="DD" geoId="IN-DD" geoName="Daman and Diu"
geoTypeId="TERRITORY"/>
+ <Geo abbreviation="DL" geoCode="DL" geoId="IN-DL" geoName="Delhi"
geoTypeId="TERRITORY"/>
<Geo abbreviation="GA" geoCode="GA" geoId="IN-GA" geoName="Goa"
geoTypeId="STATE"/>
<Geo abbreviation="GJ" geoCode="GJ" geoId="IN-GJ" geoName="Gujarat"
geoTypeId="STATE"/>
<Geo abbreviation="HR" geoCode="HR" geoId="IN-HR" geoName="Haryana"
geoTypeId="STATE"/>
<Geo abbreviation="HP" geoCode="HP" geoId="IN-HP" geoName="Himachal
Pradesh" geoTypeId="STATE"/>
- <Geo abbreviation="JK" geoCode="JK" geoId="IN-JK" geoName="Jammu And
Kashmir" geoTypeId="STATE"/>
+ <Geo abbreviation="JK" geoCode="JK" geoId="IN-JK" geoName="Jammu and
Kashmir" geoTypeId="STATE"/>
<Geo abbreviation="JH" geoCode="JH" geoId="IN-JH" geoName="Jharkhand"
geoTypeId="STATE"/>
<Geo abbreviation="KA" geoCode="KA" geoId="IN-KA" geoName="Karnataka"
geoTypeId="STATE"/>
<Geo abbreviation="KL" geoCode="KL" geoId="IN-KL" geoName="Kerala"
geoTypeId="STATE"/>
- <Geo abbreviation="LD" geoCode="LD" geoId="IN-LD" geoName="Lakshadweep"
geoTypeId="STATE"/>
+ <Geo abbreviation="LD" geoCode="LD" geoId="IN-LD" geoName="Lakshadweep"
geoTypeId="TERRITORY"/>
<Geo abbreviation="MP" geoCode="MP" geoId="IN-MP" geoName="Madhya Pradesh"
geoTypeId="STATE"/>
<Geo abbreviation="MH" geoCode="MH" geoId="IN-MH" geoName="Maharashtra"
geoTypeId="STATE"/>
<Geo abbreviation="MN" geoCode="MN" geoId="IN-MN" geoName="Manipur"
geoTypeId="STATE"/>
<Geo abbreviation="ML" geoCode="ML" geoId="IN-ML" geoName="Meghalaya"
geoTypeId="STATE"/>
<Geo abbreviation="MZ" geoCode="MZ" geoId="IN-MZ" geoName="Mizoram"
geoTypeId="STATE"/>
<Geo abbreviation="NL" geoCode="NL" geoId="IN-NL" geoName="Nagaland"
geoTypeId="STATE"/>
- <Geo abbreviation="ND" geoCode="ND" geoId="IN-ND" geoName="New Delhi"
geoTypeId="STATE"/>
- <Geo abbreviation="OR" geoCode="OR" geoId="IN-OR" geoName="Orissa"
geoTypeId="STATE"/>
- <Geo abbreviation="PY" geoCode="PY" geoId="IN-PY" geoName="Pondicherry"
geoTypeId="STATE"/>
+ <Geo abbreviation="OR" geoCode="OR" geoId="IN-OR" geoName="Odisha"
geoTypeId="STATE"/>
+ <Geo abbreviation="PY" geoCode="PY" geoId="IN-PY" geoName="Puducherry"
wellKnownText="Pondicherry" geoTypeId="TERRITORY"/>
<Geo abbreviation="PB" geoCode="PB" geoId="IN-PB" geoName="Punjab"
geoTypeId="STATE"/>
<Geo abbreviation="RJ" geoCode="RJ" geoId="IN-RJ" geoName="Rajasthan"
geoTypeId="STATE"/>
<Geo abbreviation="SK" geoCode="SK" geoId="IN-SK" geoName="Sikkim"
geoTypeId="STATE"/>
- <Geo abbreviation="TN" geoCode="TN" geoId="IN-TN" geoName="Tamilnadu"
geoTypeId="STATE"/>
+ <Geo abbreviation="TN" geoCode="TN" geoId="IN-TN" geoName="Tamil Nadu"
geoTypeId="STATE"/>
+ <Geo abbreviation="TG" geoCode="TG" geoId="IN-TG" geoName="Telangana"
geoTypeId="STATE"/>
<Geo abbreviation="TR" geoCode="TR" geoId="IN-TR" geoName="Tripura"
geoTypeId="STATE"/>
<Geo abbreviation="UP" geoCode="UP" geoId="IN-UP" geoName="Uttar Pradesh"
geoTypeId="STATE"/>
- <Geo abbreviation="UT" geoCode="UT" geoId="IN-UT" geoName="Uttaranchal"
geoTypeId="STATE"/>
+ <Geo abbreviation="UT" geoCode="UT" geoId="IN-UT" geoName="Uttarakhand"
geoTypeId="STATE"/>
<Geo abbreviation="WB" geoCode="WB" geoId="IN-WB" geoName="West Bengal"
geoTypeId="STATE"/>
<GeoAssoc geoId="IND" geoIdTo="IN-AN" geoAssocTypeId="REGIONS"/>
@@ -79,7 +80,7 @@ under the License.
<GeoAssoc geoId="IND" geoIdTo="IN-ML" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="IND" geoIdTo="IN-MZ" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="IND" geoIdTo="IN-NL" geoAssocTypeId="REGIONS"/>
- <GeoAssoc geoId="IND" geoIdTo="IN-ND" geoAssocTypeId="REGIONS"/>
+ <GeoAssoc geoId="IND" geoIdTo="IN-DL" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="IND" geoIdTo="IN-OR" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="IND" geoIdTo="IN-PY" geoAssocTypeId="REGIONS"/>
<GeoAssoc geoId="IND" geoIdTo="IN-PB" geoAssocTypeId="REGIONS"/>
