Changeset 13412 in josm


Ignore:
Timestamp:
2018-02-11T22:15:47+01:00 (4 months ago)
Author:
Don-vip
Message:

see #15036, see #15870 - update China ISO3166-2 province codes (2017-11-23 update) + unit test

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/boundaries.osm

    r13389 r13412  
    3956639566    <nd ref='-11952' />
    3956739567    <tag k='ISO3166-1:alpha2' v='TW' />
    39568     <tag k='ISO3166-2' v='CN-71' />
     39568    <tag k='ISO3166-2' v='CN-TW' />
    3956939569    <tag k='name:en' v='Taiwan' />
    3957039570    <tag k='note' v='Self admin.; Claimed by China' />
     
    4386443864    <nd ref='-22518' />
    4386543865    <tag k='ISO3166-1:alpha2' v='HK' />
    43866     <tag k='ISO3166-2' v='CN-91' />
     43866    <tag k='ISO3166-2' v='CN-HK' />
    4386743867    <tag k='driving_side' v='left' />
    4386843868    <tag k='name:en' v='Hong Kong' />
     
    4393643936    <nd ref='-22582' />
    4393743937    <tag k='ISO3166-1:alpha2' v='MO' />
    43938     <tag k='ISO3166-2' v='CN-92' />
     43938    <tag k='ISO3166-2' v='CN-MO' />
    4393943939    <tag k='driving_side' v='left' />
    4394043940    <tag k='name:en' v='Macau' />
     
    5047750477    <nd ref='-22186' />
    5047850478    <nd ref='-22190' />
    50479     <tag k='ISO3166-2' v='CN-54' />
     50479    <tag k='ISO3166-2' v='CN-XZ' />
    5048050480    <tag k='name:en' v='Tibet' />
    5048150481  </way>
     
    5069350693    <nd ref='-85124' />
    5069450694    <nd ref='-85126' />
    50695     <tag k='ISO3166-2' v='CN-65' />
     50695    <tag k='ISO3166-2' v='CN-XJ' />
    5069650696    <tag k='name:en' v='Xinjiang' />
    5069750697  </way>
     
    5103151031    <nd ref='-13018' />
    5103251032    <nd ref='-7972' />
    51033     <tag k='ISO3166-2' v='CN-15' />
     51033    <tag k='ISO3166-2' v='CN-NM' />
    5103451034    <tag k='name:en' v='Inner Mongolia' />
    5103551035  </way>
     
    5119151191    <nd ref='-85286' />
    5119251192    <nd ref='-85288' />
    51193     <tag k='ISO3166-2' v='CN-63' />
     51193    <tag k='ISO3166-2' v='CN-QH' />
    5119451194    <tag k='name:en' v='Qinghai' />
    5119551195  </way>
     
    5139651396    <nd ref='-2550' />
    5139751397    <nd ref='-2504' />
    51398     <tag k='ISO3166-2' v='CN-45' />
     51398    <tag k='ISO3166-2' v='CN-GX' />
    5139951399    <tag k='name:en' v='Guangxi' />
    5140051400  </way>
     
    5176351763    <nd ref='-87374' />
    5176451764    <nd ref='-87376' />
    51765     <tag k='ISO3166-2' v='CN-53' />
     51765    <tag k='ISO3166-2' v='CN-YN' />
    5176651766    <tag k='name:en' v='Yunnan' />
    5176751767  </way>
     
    5196151961    <nd ref='-86947' />
    5196251962    <nd ref='-86949' />
    51963     <tag k='ISO3166-2' v='CN-51' />
     51963    <tag k='ISO3166-2' v='CN-SC' />
    5196451964    <tag k='name:en' v='Sichuan' />
    5196551965  </way>
     
    5210552105    <nd ref='-89340' />
    5210652106    <nd ref='-89338' />
    52107     <tag k='ISO3166-2' v='CN-62' />
     52107    <tag k='ISO3166-2' v='CN-GS' />
    5210852108    <tag k='name:en' v='Gansu' />
    5210952109  </way>
     
    5213852138    <nd ref='-90113' />
    5213952139    <nd ref='-90115' />
    52140     <tag k='ISO3166-2' v='CN-64' />
     52140    <tag k='ISO3166-2' v='CN-NX' />
    5214152141    <tag k='name:en' v='Ningxia' />
    5214252142  </way>
     
    5227152271    <nd ref='-86295' />
    5227252272    <nd ref='-86297' />
    52273     <tag k='ISO3166-2' v='CN-23' />
     52273    <tag k='ISO3166-2' v='CN-HL' />
    5227452274    <tag k='name:en' v='Heilongjiang' />
    5227552275  </way>
     
    5240352403    <nd ref='-86345' />
    5240452404    <nd ref='-86347' />
    52405     <tag k='ISO3166-2' v='CN-22' />
     52405    <tag k='ISO3166-2' v='CN-JL' />
    5240652406    <tag k='name:en' v='Jilin' />
    5240752407  </way>
     
    5248752487    <nd ref='-12220' />
    5248852488    <nd ref='-10870' />
    52489     <tag k='ISO3166-2' v='CN-21' />
     52489    <tag k='ISO3166-2' v='CN-LN' />
    5249052490    <tag k='name:en' v='Liaoning' />
    5249152491  </way>
     
    5638656386    <nd ref='-90193' />
    5638756387    <nd ref='-90195' />
    56388     <tag k='ISO3166-2' v='CN-61' />
     56388    <tag k='ISO3166-2' v='CN-SN' />
    5638956389    <tag k='name:en' v='Shaanxi' />
    5639056390  </way>
     
    5657156571    <nd ref='-87464' />
    5657256572    <nd ref='-87466' />
    56573     <tag k='ISO3166-2' v='CN-52' />
     56573    <tag k='ISO3166-2' v='CN-GZ' />
    5657456574    <tag k='name:en' v='Guizhou' />
    5657556575  </way>
     
    5672856728    <nd ref='-99017' />
    5672956729    <nd ref='-99011' />
    56730     <tag k='ISO3166-2' v='CN-50' />
     56730    <tag k='ISO3166-2' v='CN-CQ' />
    5673156731    <tag k='name:en' v='Chongqing' />
    5673256732  </way>
     
    5673856738    <nd ref='-11958' />
    5673956739    <nd ref='-11960' />
    56740     <tag k='ISO3166-2' v='CN-46' />
     56740    <tag k='ISO3166-2' v='CN-HI' />
    5674156741    <tag k='name:en' v='Hainan' />
    5674256742  </way>
     
    5700757007    <nd ref='-98985' />
    5700857008    <nd ref='-99758' />
    57009     <tag k='ISO3166-2' v='CN-43' />
     57009    <tag k='ISO3166-2' v='CN-HN' />
    5701057010    <tag k='name:en' v='Hunan' />
    5701157011  </way>
     
    5715857158    <nd ref='-98765' />
    5715957159    <nd ref='-98767' />
    57160     <tag k='ISO3166-2' v='CN-42' />
     57160    <tag k='ISO3166-2' v='CN-HB' />
    5716157161    <tag k='name:en' v='Hubei' />
    5716257162  </way>
     
    5726357263    <nd ref='-98777' />
    5726457264    <nd ref='-98779' />
    57265     <tag k='ISO3166-2' v='CN-41' />
     57265    <tag k='ISO3166-2' v='CN-HA' />
    5726657266    <tag k='name:en' v='Henan' />
    5726757267  </way>
     
    5732157321    <nd ref='-10870' />
    5732257322    <nd ref='-90624' />
    57323     <tag k='ISO3166-2' v='CN-37' />
     57323    <tag k='ISO3166-2' v='CN-SD' />
    5732457324    <tag k='name:en' v='Shandong' />
    5732557325  </way>
     
    5744357443    <nd ref='-99569' />
    5744457444    <nd ref='-99567' />
    57445     <tag k='ISO3166-2' v='CN-36' />
     57445    <tag k='ISO3166-2' v='CN-JX' />
    5744657446    <tag k='name:en' v='Jiangxi' />
    5744757447  </way>
     
    5756657566    <nd ref='-100569' />
    5756757567    <nd ref='-100564' />
    57568     <tag k='ISO3166-2' v='CN-34' />
     57568    <tag k='ISO3166-2' v='CN-AH' />
    5756957569    <tag k='name:en' v='Anhui' />
    5757057570  </way>
     
    5764357643    <nd ref='-99519' />
    5764457644    <nd ref='-99515' />
    57645     <tag k='ISO3166-2' v='CN-35' />
     57645    <tag k='ISO3166-2' v='CN-FJ' />
    5764657646    <tag k='name:en' v='Fujian' />
    5764757647  </way>
     
    5771657716    <nd ref='-100689' />
    5771757717    <nd ref='-11942' />
    57718     <tag k='ISO3166-2' v='CN-33' />
     57718    <tag k='ISO3166-2' v='CN-ZJ' />
    5771957719    <tag k='name:en' v='Zhejiang' />
    5772057720  </way>
     
    5781457814    <nd ref='-100988' />
    5781557815    <nd ref='-100986' />
    57816     <tag k='ISO3166-2' v='CN-32' />
     57816    <tag k='ISO3166-2' v='CN-JS' />
    5781757817    <tag k='name:en' v='Jiangsu' />
    5781857818  </way>
     
    5785157851    <nd ref='-101118' />
    5785257852    <nd ref='-11942' />
    57853     <tag k='ISO3166-2' v='CN-31' />
     57853    <tag k='ISO3166-2' v='CN-SH' />
    5785457854    <tag k='name:en' v='Shanghai' />
    5785557855  </way>
     
    5794457944    <nd ref='-100209' />
    5794557945    <nd ref='-98779' />
    57946     <tag k='ISO3166-2' v='CN-14' />
     57946    <tag k='ISO3166-2' v='CN-SX' />
    5794757947    <tag k='name:en' v='Shanxi' />
    5794857948  </way>
     
    5813958139    <nd ref='-101380' />
    5814058140    <nd ref='-101382' />
    58141     <tag k='ISO3166-2' v='CN-13' />
     58141    <tag k='ISO3166-2' v='CN-HE' />
    5814258142    <tag k='name:en' v='Hebei' />
    5814358143  </way>
     
    5819358193    <nd ref='-101435' />
    5819458194    <nd ref='-101433' />
    58195     <tag k='ISO3166-2' v='CN-12' />
     58195    <tag k='ISO3166-2' v='CN-TJ' />
    5819658196    <tag k='name:en' v='Tianjin' />
    5819758197  </way>
     
    5826358263    <nd ref='-101581' />
    5826458264    <nd ref='-101731' />
    58265     <tag k='ISO3166-2' v='CN-11' />
     58265    <tag k='ISO3166-2' v='CN-BJ' />
    5826658266    <tag k='name:en' v='Beijing' />
    5826758267  </way>
     
    5871658716    <member type='way' ref='-29370' role='inner' />
    5871758717    <member type='way' ref='-29384' role='inner' />
    58718     <tag k='ISO3166-2' v='CN-44' />
     58718    <tag k='ISO3166-2' v='CN-GD' />
    5871958719    <tag k='name:en' v='Guangdong' />
    5872058720    <tag k='type' v='multipolygon' />
  • trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java

    r12858 r13412  
    3535            "AU-ACT", "AU-NSW", "AU-NT", "AU-QLD", "AU-SA", "AU-TAS", "AU-VIC", "AU-WA",
    3636            "CA-AB", "CA-BC", "CA-MB", "CA-NB", "CA-NL", "CA-NS", "CA-NT", "CA-NU", "CA-ON", "CA-PE", "CA-QC", "CA-SK", "CA-YT",
     37            "CN-AH", "CN-BJ", "CN-CQ", "CN-FJ", "CN-GD", "CN-GS", "CN-GX", "CN-GZ", "CN-HA", "CN-HB", "CN-HE", "CN-HI", "CN-HK", "CN-HL",
     38            "CN-HN", "CN-JL", "CN-JS", "CN-JX", "CN-LN", "CN-MO", "CN-NM", "CN-NX", "CN-QH", "CN-SC", "CN-SD", "CN-SH", "CN-SN", "CN-SX",
     39            "CN-TJ", "CN-TW", "CN-XJ", "CN-XZ", "CN-YN", "CN-ZJ",
     40            "IN-AP", "IN-AR", "IN-AS", "IN-BR", "IN-CT", "IN-GA", "IN-GJ", "IN-HR", "IN-HP", "IN-JK", "IN-JH", "IN-KA", "IN-KL", "IN-MP",
     41            "IN-MH", "IN-MN", "IN-ML", "IN-MZ", "IN-NL", "IN-OR", "IN-PB", "IN-RJ", "IN-SK", "IN-TN", "IN-TG", "IN-TR", "IN-UT", "IN-UP",
     42            "IN-WB", "IN-AN", "IN-CH", "IN-DN", "IN-DD", "IN-DL", "IN-LD", "IN-PY",
    3743            "US-AL", "US-AK", "US-AS", "US-AZ", "US-AR", "US-CA", "US-CO", "US-CT", "US-DE", "US-DC", "US-FL", "US-GA", "US-GU", "US-HI",
    3844            "US-ID", "US-IL", "US-IN", "US-IA", "US-KS", "US-KY", "US-LA", "US-ME", "US-MD", "US-MA", "US-MI", "US-MN", "US-MS", "US-MO",
Note: See TracChangeset for help on using the changeset viewer.