From cbd6a1dea81d6e764c1820f14907d1771c4cd21b Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Fri, 9 Sep 2011 21:16:32 +0000 Subject: [PATCH] geo module updates --- source/Ox.Geo/json/Ox.Geo.json | 139 ++++++++++++++++++++-------- source/Ox.Geo/png/icons/16/CN.png | Bin 351 -> 458 bytes source/Ox.Geo/png/icons/16/SB.png | Bin 478 -> 463 bytes source/Ox.Geo/png/icons/16/SUHH.png | Bin 241 -> 433 bytes tools/geo/py/geo.py | 62 ++++++------- 5 files changed, 129 insertions(+), 72 deletions(-) diff --git a/source/Ox.Geo/json/Ox.Geo.json b/source/Ox.Geo/json/Ox.Geo.json index ca1331a9..0d051a4e 100644 --- a/source/Ox.Geo/json/Ox.Geo.json +++ b/source/Ox.Geo/json/Ox.Geo.json @@ -141,7 +141,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/7/77/Flag_of_Algeria.svg", "imdbCode": "dz", "imdbName": "Algeria", - "languages": [], + "languages": [ + "Tamashek" + ], "name": "Algeria", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Algeria", @@ -519,7 +521,8 @@ "imdbName": "Australia", "languages": [ "Aboriginal", - "Australian" + "Australian", + "Gunwinggu" ], "name": "Australia", "other": false, @@ -1173,7 +1176,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/31/Flag_of_Burkina_Faso.svg", "imdbCode": "bf", "imdbName": "Burkina Faso", - "languages": [], + "languages": [ + "More" + ], "name": "Burkina Faso", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Burkina_Faso", @@ -1357,7 +1362,8 @@ "imdbCode": "ca", "imdbName": "Canada", "languages": [ - "Cree" + "Cree", + "Nisga'a" ], "name": "Canada", "other": false, @@ -1436,7 +1442,10 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/38/Flag_of_Cape_Verde.svg", "imdbCode": "cv", "imdbName": "Cape Verde", - "languages": [], + "languages": [ + "Kabuverdianu", + "Kriolu" + ], "name": "Cape Verde", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Cape_Verde", @@ -1932,7 +1941,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSElEQVQ4EZWRv0oDQRDGv/1zuVtT+AfB2lhZCHkBTWPpu4RopY0HgvgEPoCPoIWdFopJYat2Np6CIiZgIYHcnjObnOfJqXcDs7ss+/3mm1kcHJ0lHKM4Tqw7VVvU+fNC6Nc8rDYXEccWQgoIlA81t7wenlzcwPge1pqNyhBlllph3dRwfHk3gVRzooJGK2TD9YAht5UhzkHacQbRWTs0kL9mkgNkTridMQSChkrJe1HqtDrvSQJYJJifnsL24SmGQmNnYwX0v5D0O0WRA7gHBCEF1OwMXvb28bR7jw/lQTK9IHIAriHoYV8H6ERdbL1eo2+lk9kCMV99AVLxwBuLOw9dvNFZql+Uk2sHyIlJyNUZxG7+Czcafugq/xAXjy2PpAapZ8+ALX+vXEbMKPmufGxGVy5T22XFDNDtqIf2Yw8DbVzPVcQM+AQxrLkCITMflwAAAABJRU5ErkJggg==" }, - "area": 135542041322.53429, + "area": 135542041322.53484, "east": 18.859236, "lat": 49.817492, "lng": 15.472962, @@ -1960,7 +1969,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSElEQVQ4EZWRv0oDQRDGv/1zuVtT+AfB2lhZCHkBTWPpu4RopY0HgvgEPoCPoIWdFopJYat2Np6CIiZgIYHcnjObnOfJqXcDs7ss+/3mm1kcHJ0lHKM4Tqw7VVvU+fNC6Nc8rDYXEccWQgoIlA81t7wenlzcwPge1pqNyhBlllph3dRwfHk3gVRzooJGK2TD9YAht5UhzkHacQbRWTs0kL9mkgNkTridMQSChkrJe1HqtDrvSQJYJJifnsL24SmGQmNnYwX0v5D0O0WRA7gHBCEF1OwMXvb28bR7jw/lQTK9IHIAriHoYV8H6ERdbL1eo2+lk9kCMV99AVLxwBuLOw9dvNFZql+Uk2sHyIlJyNUZxG7+Czcafugq/xAXjy2PpAapZ8+ALX+vXEbMKPmufGxGVy5T22XFDNDtqIf2Yw8DbVzPVcQM+AQxrLkCITMflwAAAABJRU5ErkJggg==" }, - "area": 280624359208.4659, + "area": 280624359208.4667, "east": 22.5589337, "lat": 49.3935184, "lng": 17.32496245, @@ -1978,7 +1987,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6f/Flag_of_the_Democratic_Republic_of_the_Congo.svg", "imdbCode": "cd", "imdbName": "Democratic Republic of the Congo", - "languages": [], + "languages": [ + "Lingala" + ], "name": "Democratic Republic of the Congo", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Democratic_Republic_of_the_Congo", @@ -2142,7 +2153,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB80lEQVQ4EZ1TTWsUQRB91TNDzC4YSIhsNEQUgohhIQdP4lHyF3LxJogHP/6FeFYvXkTEf+BBPHgWg8aDumrwkGBWAysJYqJmprt81WO7Me5erN1iul7Ve1Nd3SMAlP7f5oYxHTMitdt6mLHk7w6MZKb7+hqKZ/sEfM3H/KxDb1ej0OQBwfL7EDOs/8fsXQqp/WADev1yoc/vj+ilttOLcy6ub1wpdKzZr4sc8uQmEKXTXtyFQtpzguqRR6vtkFVA701AtZDhVUfh75Saaq2VfJFz4g+OfWxPCVbOkHSrROtlwPq8g2Nu5rFHd0Nx4mqB2Yciza4i/FbJN60XBhkFNo9y3Hzj5NuAwGXDEvx/GyX2LmBtF/h8zGG86+EtRY7LOJWcXtBDUGyZBpOrJx3KAixUrJzN8KMQfCUeOGWrNU7kGqB0xiifBSznFb4fdjjNqRdrHA9JE088lthd526Fhac+nrsnhynIxrl6iHYUBuwcd/L6SI6PDypugYBh9OnzOU6tE/sQ4hWxWrP80O3IqyOilQ/o3CvxqSWY2I7zRa+pmNkpMX1NrXU78D8mutQPYxd2bRv0n4KtLy5e57FxbmWEWbai9a72CLzoCyQ02M2gUPoGYkwsxanOnvneIK1ToQ3XzO6CCQ6ygQKpMH1AKR70/AVF6Lgy1FzN1gAAAABJRU5ErkJggg==" }, - "area": 176112234867.3707, + "area": 176112234867.3703, "east": 15.0418536, "lat": 52.428094, "lng": 12.4592868, @@ -2817,6 +2828,7 @@ "languages": [ "German", "Eastern Frisian", + "Sorbian", "Low German" ], "name": "Germany", @@ -3112,7 +3124,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/e/ed/Flag_of_Guinea.svg", "imdbCode": "gn", "imdbName": "Guinea", - "languages": [], + "languages": [ + "Malinka" + ], "name": "Guinea", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Guinea", @@ -3349,13 +3363,18 @@ "imdbName": "India", "languages": [ "Telugu", - "Hindi", + "Ladakhi", "Marathi", "Punjabi", + "Chhattisgarhi", "Gujarati", "Indian", + "Hindi", "Rajasthani", - "Kannada" + "Kannada", + "Konkani", + "Assamese", + "Nagpuri" ], "name": "India", "other": false, @@ -3382,7 +3401,8 @@ "imdbCode": "id", "imdbName": "Indonesia", "languages": [ - "Indonesian" + "Indonesian", + "Balinese" ], "name": "Indonesia", "other": false, @@ -3708,7 +3728,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Kenya.svg", "imdbCode": "ke", "imdbName": "Kenya", - "languages": [], + "languages": [ + "Swahili" + ], "name": "Kenya", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Kenya", @@ -3838,7 +3860,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/56/Flag_of_Laos.svg", "imdbCode": "la", "imdbName": "Laos", - "languages": [], + "languages": [ + "Lao" + ], "name": "Laos", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Laos", @@ -3872,7 +3896,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAV0lEQVQ4EWOcZ2D5n4ECwESBXrDWgTeAhZGZmSJfsPx4/54iAxhvrNlAUSww/gcCSpxAcSyw3Fy7kRIHMDBOV9KmyAssHIKCFLmA5f/fvxQZQHEgDrwBAKUeE3ZR1eTdAAAAAElFTkSuQmCC" }, - "area": 120694156663.70555, + "area": 120694156663.70496, "east": 28.241403, "lat": 56.879635, "lng": 24.603189, @@ -3915,7 +3939,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/4a/Flag_of_Lesotho.svg", "imdbCode": "ls", "imdbName": "Lesotho", - "languages": [], + "languages": [ + "Sotho" + ], "name": "Lesotho", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Lesotho", @@ -3997,7 +4023,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPUlEQVQ4Ed2Sv07DMBDGPyeGFFqiYioBYkBiQlCxsaBKTDwLjwGPwYuwd0JiBAYWQEJipZUKtE0j33F2EnWoHBAjHnJfzr7vfv6jcHjBkBEpAnHspGgrOvK69sNM5SoFmq1iRY/RiMdeA6q2tprUkE6NpQl2199gmgM4nOGXwetHB9O8IT4esFq/EDVyjbODB5yf3uH2MYaSxsf7hKv+Ea7vTxAlmWwnTKNBwKZh7Gy30GsmHryTZtiSnJtzhh5roXeR0Coi3Lzsoff0jPfByG/dtBOfU7H1xaH+bnMK3UuGlbMcDYHZZ2G7vAakbSAWhBp8MJFObeYxI9OSmHoDZrlGO4GE2sHMUP2NbnnMEkpV3GAIfO5p5R1oQ9N5plKVUfUfiCQEOscvXlzIQJD1z6CBakm72r+3L33/gcE38EhnAbC8XMoAAAAASUVORK5CYII=" }, - "area": 307187958.0515524, + "area": 307187958.05156535, "east": 9.63565, "lat": 47.166, "lng": 9.555373, @@ -4121,7 +4147,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/d/d1/Flag_of_Malawi.svg", "imdbCode": "mw", "imdbName": "Malawi", - "languages": [], + "languages": [ + "Nyanja" + ], "name": "Malawi", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Malawi", @@ -4207,7 +4235,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAATUlEQVQ4EWMU2Wr1nwEKmIH0+39MDCtEnzEEcn9i+PWPmYHp738GFv7/DG83szHcL+UBs///helgYGBCMMljjRowGoiglDOaDgZDGAAAPj8SJOyaQUoAAAAASUVORK5CYII=" }, - "area": 2887946411067.381, + "area": 2887946411067.38, "east": 4.2666666, "lat": 17.570692, "lng": -3.996166, @@ -4252,7 +4280,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2e/Flag_of_the_Marshall_Islands.svg", "imdbCode": "mh", "imdbName": "Marshall Islands", - "languages": [], + "languages": [ + "Marshallese" + ], "name": "Marshall Islands", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Marshall_Islands", @@ -4304,7 +4334,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/4/43/Flag_of_Mauritania.svg", "imdbCode": "mr", "imdbName": "Mauritania", - "languages": [], + "languages": [ + "Hassanya" + ], "name": "Mauritania", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Mauritania", @@ -4582,7 +4614,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/2/2c/Flag_of_Morocco.svg", "imdbCode": "ma", "imdbName": "Morocco", - "languages": [], + "languages": [ + "Berber" + ], "name": "Morocco", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Morocco", @@ -4884,7 +4918,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/3e/Flag_of_New_Zealand.svg", "imdbCode": "nz", "imdbName": "New Zealand", - "languages": [], + "languages": [ + "Maori" + ], "name": "New Zealand", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/New_Zealand", @@ -4960,7 +4996,9 @@ "imdbCode": "ng", "imdbName": "Nigeria", "languages": [ - "Ibo" + "Yoruba", + "Ibo", + "Hausa" ], "name": "Nigeria", "other": false, @@ -5227,6 +5265,7 @@ "imdbCode": "pk", "imdbName": "Pakistan", "languages": [ + "Sindhi", "Urdu" ], "name": "Pakistan", @@ -5393,14 +5432,17 @@ "Cantonese", "Tibetan", "Chinese", + "Chaozhou", "Shanghainese", - "Naxi" + "Hokkien", + "Naxi", + "Shanxi" ], "name": "China", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/People%27s_Republic_of_China", "imageURLs": { - "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQ0lEQVQ4Ee1RO07EMBB9dpxNNtoPEkIcYUVHwwkoKOgoOAM34gpIewkoaDgBNIiOgu8i9uON42EmwdpgfhI1lhLPaOa9eW+srrfWCOFIpEISxauuVgOg64yLKuGv04D8XKG77TDYt6gemdFHZC0KDQYKIBs59PcYMFFIegR7leD1tINixyEZEsi1UK3QgAvDA4vh4QJJn2A2PZ5PclQvPLlU6O0u4W0K3LNYw1IjK5pY3vQshc4IeoMwu0jh7nRtRxWEyThHecM512OwCDHwCnrg8XBcNFN5sOwDJVubKawfzTE9T2EvDVT+mUTVr8AgWsiPwTxJVKVsRRRUTxq0fK9zS3xWr9ClGiBLFe+yi2xUwd0ygRVZMbTJGwVxTcSwBbH3nfcAMSH4cIsVXnztieOfztcEgvgFGEibHYTsD/c/AfAGWEtxmUXGJyYAAAAASUVORK5CYII=" + "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABuUlEQVQ4EaVSu0oDURA996672axBTMDETgQRLAS1Eezsba0V8S9EC8kX+C22YikWVpY+GsU3BjXJJtndu57Zh8aoIDhks7kz55w5MzfqcmY0xj9C/5n7C/LntBqQpUfTZNIM5Hn8LkBwHLCSi/CsbKC03IMl04pIXvsiIEk+qhjDmSBKgEN8EoEYIytdWGMGpkVQlGL5nTlgLiYhvNGwawaVDR/hg4Z5Y4Eeja9wt11C78yCOxfCKlNVRBIBIfcAdzpCdaeFyqaP4kKA2m4L5TUfyiGYnySIrax34M6GMJ1UXKcWge6FhaihUVwMoSpAcT6Ef2IjzoD53Pd1D60jG9qjKl2nSxSbbYXmgQPTUAhvNXrnGu1jO1lgvwNFLHt/uEoFJEE1dzbA056Hq9URBNcWClMRTJc1YchS2bS61Ya3FCR7kfbq458oIBmXlmXuOOBbbGbLyl04kxGiZ42QThVv6dMBsRIJyeLbzcgyJ692vN6EQ0ed0yFELylZROWmv4ZY7Q86Ezev+wVEjxp6mCxpmzX8LtBPlt+JANA8dKDFVR9Zyp8jyOm3oIguZeQBzN8EhDQ4Wib0DiRxmABeMgqLAAAAAElFTkSuQmCC" }, "area": 21555709010335.66, "east": 134.77281, @@ -5473,6 +5515,7 @@ "imdbCode": "ph", "imdbName": "Philippines", "languages": [ + "Bicolano", "Filipino", "Tagalog" ], @@ -5536,7 +5579,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAR0lEQVQ4EWP8DwQMFAAmCvSCtQ4DA1gYKAtDBhYGRkaKwpHl34fPFBnAeE/Fk6J0wPL3zQeKXMDCyMpCmQGUxsIwSIkUewEA3ncQMz/AwEIAAAAASUVORK5CYII=" }, - "area": 451718322463.4839, + "area": 451718322463.4831, "east": 24.1458933, "lat": 51.919438, "lng": 19.145136, @@ -5736,7 +5779,8 @@ "imdbCode": "ie", "imdbName": "Ireland", "languages": [ - "Irish Gaelic" + "Irish Gaelic", + "Gaelic" ], "name": "Ireland", "other": false, @@ -5948,10 +5992,10 @@ "imdbCode": "ru", "imdbName": "Russia", "languages": [ + "Tatar", "Russian", "Chechen", - "Khanty", - "Tatar" + "Khanty" ], "name": "Russia", "other": false, @@ -6209,7 +6253,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/3/31/Flag_of_Samoa.svg", "imdbCode": "ws", "imdbName": "Samoa", - "languages": [], + "languages": [ + "Samoan" + ], "name": "Samoa", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Samoa", @@ -6589,7 +6635,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4EZ1Tz2sTQRh938zsj0TToBLoIaIEEwpVW5VSf5y9KXoRhB4E/wBBpP4JVaj+BYonEfHowYuhgqJY8WJRFNrQgpVCL8Em2t1sd8Zvp7sxCe2lD3b4duZ9b9+8maWQ4TKwR4g99nXbVLfqLeIYMAYQqb7WABEgZS/L1irWBsmTgZgoBompUEIziXAPyBgdsnxfBn/vP4ReakCdOG6dbH39BlGrIn/3dk/rdqmmZuYglQtBBpuRwalhD7ceP0FnS7PAqBXovJ6D//YdZkrn8WUtQM4hZKbVs/oS79VhE2wtMGieLGJ6aB+ikVFQuWwF5LlJuIs/UP/8E28WmoDP2aQ7UYWCB5IOJM+0POBgjivHga5WIZMMmairNZjlBg7xmir6KLgEjtlCwSbOTHZgIo22FlBcH5i9h/XrN0A6RunFU2B8DO1YMCfaPo3MQUvl/2/Bi/GebTw/cxXzvyv4tFYBt2Di6BVMnB7Hh5aL2Mujqfg4UwG6dmE6lEK5/H2QIIRBhMmzx/DIHUFjYdXarI2VcXPzOz7ON+DnHJgsQV6lP8OHQ5/AAnxRGIkwRR2sX7yEO0cuWwcPVl6iVH/F2bgpy1LtQKvlGgsQC/TDb2/Aq1Z40iBYXEa4f6ifkL4paTSfAGVb6pI6hSKClV/2XXAtOcydsPO/wMwkfemlF3SX5kRwVwH7tYF7b+cGhn9Ia7l9yRbB1gAAAABJRU5ErkJggg==" }, - "area": 88196718553.4777, + "area": 88196718553.47816, "east": 22.5589337, "lat": 48.669026, "lng": 19.699024, @@ -6616,7 +6662,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABXklEQVQ4EaVRu0oDQRQ980g0y0ZcskoExQdiZ5OPsLCysrK38QfED8gHWClWlum1sREsbLQQrRTBNGvhxgQMamJ21rsTNnHXURZyYB/3Meeec4eFBBigKB2XGGPg9JjA/iIwNZtyMp3UcuhV99u4f37R5ZUZF/NuESARaR2sF6iBBS2ZpPb8V6zunuCx2yCCEAs5F3fVdeSnShSGiCzFkIIPg5hfOgV0Pz6xNLdM3oH3ugdrsgAdpDSwzf2LgYJoGoQAmi2U8wp722uas3pwBq9DMx0HCAL6GQ6VtfOHWE3/yzmN7GCnMoEn2gPphXpro3bVAiwfUCrRL6U9lkjowB7H0W0Di6eX2u/hTQNymvyraHoSTGwd/7DQL0YCFRd6cpThRRucDv9qpJoMclbUY0aJFkdQgYKi1ZggN7xrUz5zjn2VZ03KMhPI5n8WMtBIESavJcOZRAtd+mgYmeAbHI5q+BAfEUQAAAAASUVORK5CYII=" }, - "area": 40411341662.1978, + "area": 40411341662.19755, "east": 16.6104836, "lat": 46.151241, "lng": 14.995463, @@ -6639,7 +6685,7 @@ "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Solomon_Islands", "imageURLs": { - "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABy0lEQVQ4EaWSz2sTQRTHPzM7STab2rSWWmktCmIr9eSlBUUDPXvQf0DwUsE/QDz6L3jz5EGw/rgFRaTqxSIoVLd4aLUlFA+iNRYVKmlMdsa3STZoccmhc5jZffs+733fd0dxYcGxh6X3wKKUQysFWssmK969znMrkLJpZQW0uIZBu4bF/mqiBHTWEW03UjBpFINa8msBth4wPvQTc/RQH5NjAY8XvzAw7DN7aoTyq69YKZOYE4OxPFvLS9BwdmKVyzNl6o0Kxs9oir7HgcEchUKGwcC0wBjeDZYmVpibeUTehNx9k2Vxo1/qnnvi+F7n2pUpnoVbLL3cxIz6osB1O3ZBL+RemOH5+n4ZRdOfk9Gnr752p48PcON+hfHDAZdmR7l++7Po9ShNvpeOD8n/DSpRnG/iRKJYhtnYrLHzW4zLwceqYf7FDqVja8xNt6W2O47IOFrGi0FLFBvUWab6o0b1k9DZImeOrHDxZJmh4F1HajrYLUC0j9KJDy1XfW+ZB8tZnq71BpMC6uat8+5gX8j8W9M2Z9eMSWLaae4srbL+bZimmPa/GdPAJG4qW0UK2Ujem/+YkyT0Oo1votbv6JWY9l0n1zUtoVf8D56Wu5XPJZjUAAAAAElFTkSuQmCC" + "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABvklEQVQ4EaWRTWsTQRjHf7s7SXY39iWVttAqCqW21JOXChUJ9CyCX6DgpYd+APHoV/ArCPbt1FSRopWKIigo2yqkWg3ioWgNIl5M22x2fCbJat+WHPLAzOzOPL/5/+d5LG481rQRdhsstqVlWGDbMkmY2Wl+1zcSJtuKBIyI9lyUrkboqsbKKnQYUfsTgq9ORA1kVKKKZ6SYGN5EDZ05xcigz6MX3+nudZmc6Kfw6geSSlycQ6BW5C9sMn15Gd/ZQLkpmy7XoS+XIZtNkRN1A5pxHCwK+BBPBcy9TbNW6hND11Y0v/a4PTPGavCTNy93UAOuONANq3XFJugEzAcpnn7qkcuNcIg1fuu1vjLazd2FEmfP+dycHODOvW/yUIf8yAdRfIB3FPRCtFiMZKgvOxV296uQga9lxezzXfLDW0yPN6w2FPvrijnfgFJoU6BmqPLvCuVtodNdXD1fZOpSgdP+u6bVZPDfBex3kL/4UawWxOo6i+tpnmy1BuMLrNn717WnNpgL1P/iHHhjnJi0qqX3RdY+90rNHWnh8TcmgfG+elbqodOtyX94qDhxQqtVdWRq9Xa0Skw6t00v24m/xWa2rBPsuGQAAAAASUVORK5CYII=" }, "area": 1042169056872.7578, "east": 168.0249023, @@ -6724,7 +6770,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACCElEQVQ4EY2TzWsTURTFf29mMhOVSBeCm7hoaAbrB1LB4qKiOzfiTlv8KNqFVbDBjQoNFgURV4INIlXBUuvCf8CVLty1RQQXboKgNAUR/GpTTZO8mfG+qRBsUuOFt3n3nnPvOfc9lcgfjYJqhdvHLnHZ20bxzHEc10M5DoQh7cKqa4Vyk1x5dod79jf8+5PoWpVIa7Csdnis8Z0fCLSNk9zIxYdjFDbX8R88+W8Sq3ehyNTe9wJI4KY6yE3kKWyq4E80SGI5lg1281ES0YtrHp92Zzk104WbDKiVfzA+fJOR5Q0Uh08TVaurcqKoSZLgkWvFq+sepW4hmRMST0iWF7l7doxcqhNK88glpnJtKCsmMDkhueGxsCPLydkstlsnEDMH+o7QIdKiUNqotXCktWBNwpwwVDwf9fi+K8Pg26ysMkJXfkoikLIWaLmVZbcJmUwMWLeojYQaQwcOsyWVEonGqeYpZEjRIAmjPzZx1pioxcQyj4eust/rY/7jIrbntPLQSFC8lDWWxLzGGpeYPj9K+msP3f2PYEVepS3dm5eAmrmVjIqZLgZf+6udyw3wof5plJeQjdixhFZGOHNpn9ybjHygujygJZ5eyJP+0sPBP2DlWGi9/qeycu86sZ0AvVJh6lyerZ/3/AUOZf//CichNgbyVAsDI2z/tY/eE5Px2KZzO7Ah/g3rxtdbTsTsOgAAAABJRU5ErkJggg==" }, - "area": 2338673347483.458, + "area": 2338673347483.4565, "east": 33.0469, "lat": -30.559482, "lng": 22.937506, @@ -6751,7 +6797,7 @@ "imageURLs": { "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACGElEQVQ4EaWTT2sTQRjGfzO7SZo/TdDQ1qZtGqk04EGF6kXwIEIEBfUjCIJ49DP4GbzoxQ/gRW/iUagFK/6hUlHUQqyttpaStEm6SXbGdzddmvYUcGF2ntl9n+d9Zt53FNy1/MejlTpgB7BveQgfRB1G2lpfAi1aB2/CIZBA+ai1/mSRjC6NZSTQwZgmaceXYTAiaqzHZNLH0TqMVYGgjXBEB/fe1QKF8hQP51vc9t+GFh6vFbhfybFKlgePFjFNX8iGwkiL9b/pEIvHUMUdWVnizO57nl+YZev1Cn69zvWLHbz4OC/ffCDmadpWkc/nmMksM6yOs+6V2anVsErj6lSMxKkSnfW1kOxks8TGC9Q/fcW0YiidkkweE5PjJLPXmPB8OpsddurbcnYOenvuCgvtUW4sTDOfO8srfZJbi9N8PH+TreJpPOOLQIxW6yfxE8vky7/R9p18M+EWVDF1x1Zlj4ha2gmKaGn4bZnTFEcTrG420K5LpbLH1Nw2TnyGF0++8OP7MZTKoKtNsaESMhwhahmyFtsKn+pGQ6oRVEgqs/GNX0s1XHeMy+dmJYEblt8Nchrbq3jURMYEayUZlAgbfH+I4VYb9WeXz0+fUYo35f8lCfEkaqBWVqRjHl1x1zEuSXePRndIRKz4GOiRc+kk9iMFd5OCe4fY64YBRILGjppb7ZMD2oAOenckytN/RwZ2EJGPzv8AmRbCOn6j05EAAAAASUVORK5CYII=" }, - "area": 531522905979.88965, + "area": 531522905979.8907, "east": -25.4663086, "lat": -54.429579, "lng": -36.587909, @@ -6892,7 +6938,7 @@ "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Soviet_Union", "imageURLs": { - "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA2klEQVQ4Ee1SSwoCMQx9bUfF8QOuBDdeQPwcwnt4VA/gxjsI7gQVN6JT35tOxYU4nb2Btkma95ImNTvAo5KomOhIOLMyhgjPNVjRKoDrHjBii4w/iGy8Kwh8nILlqaeKBSkKZhougHwG3I9Adxp8SHiLLWO4tSZAb86qmb2/BFyHNSQ8IRNAJOctsx+A8Ya4J5fAuqghyRTkcmC0Zg8uXDfa7QrMo06MxmhcyKhGSpTYsjcpzSzHqJIlTiApJEoBKzT8A2mUVFCIDvv7H3w6m+h/Ao67ScO+xb4AhY43+gOu/2cAAAAASUVORK5CYII=" + "icon16": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABmElEQVQ4EaWSvS+DURTGf2/rq7TVlBAGi4S0NhGbxsRCmMXI4G8wGWz+AXaJVSLmDkYTgzaRSJo0QiKIr0q1PKfvy6tvGyROcnPPPfc+z3nOucc5hnf+YaGfsMb8G3tTAkfRqgOxca0J17dYM2tpCApYVdpEBtr6dCs/HIO7LDi6C0pqzivQ84mAnRCKuH4Q+JnYaWiiZdFywtCSFEkXvBakqlIL/0GBslerkj8AlZL7Pj6lXXEjDlp9CTpZ8/qXYOzI7cPThVSojMFVEYo42EyfwMB6EE3B0Aa8FbRulU+Zrw+hYxiS04oFSHwCXdjh5RzO5iG3LKJ16J0VSPH7LPQseC34VkrDN76X4SHngvIrkN6T9Cedb1RKVEwBqyOwfy5LcjwN3RkobsOp1IzuqPYEXG419tEnEFg/Re+MpM7BYx5Su1C6EkhNjIy4M2FJaj/iKXEJvJrC7SJYhMKmCIpwu69RnlQTTYHmYmANbg6EtEye1Q/SN/aQADY89tbvdL1vHH4JdlL9tXk3V0jzW4X+kqz74Eh/AMMmcPP4q0S3AAAAAElFTkSuQmCC" }, "area": 50536546494694.38, "east": -168.97788, @@ -7153,7 +7199,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/5/53/Flag_of_Syria.svg", "imdbCode": "sy", "imdbName": "Syria", - "languages": [], + "languages": [ + "Aramaic" + ], "name": "Syria", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Syria", @@ -7702,6 +7750,7 @@ "imdbCode": "gb", "imdbName": "United Kingdom", "languages": [ + "Cornish", "English", "British" ], @@ -7744,9 +7793,15 @@ "imdbCode": "us", "imdbName": "United States", "languages": [ + "Navajo", + "Creek", + "Cheyenne", "Hawaiian", + "Sioux", + "Cherokee", "American", - "Hopi" + "Hopi", + "Shoshoni" ], "name": "United States", "other": false, @@ -8221,7 +8276,9 @@ "flagURL": "http://upload.wikimedia.org/wikipedia/commons/6/6a/Flag_of_Zimbabwe.svg", "imdbCode": "zw", "imdbName": "Zimbabwe", - "languages": [], + "languages": [ + "Shona" + ], "name": "Zimbabwe", "other": false, "wikipediaURL": "http://en.wikipedia.org/wiki/Zimbabwe", diff --git a/source/Ox.Geo/png/icons/16/CN.png b/source/Ox.Geo/png/icons/16/CN.png index dff87d063a2068c0fcc5c6c0f589669787bb36e9..915d3fe9091e510087fd8d2f8976aa77ac65e3f2 100644 GIT binary patch delta 432 zcmV;h0Z;zl0?GrBB!7`fL_t(|oTZaJZxcZfhM$@9UG5GmN-UAkA*2Y2A`;LbrK6{% z2BG|m2nv*6z;B^Nl!$_gl8*+&w_*Xd&-UHUQ0yI!jU^&wq%C$e?=$bt&dU31Th2K` z&zrgaSXTB9HWIM2035tN1#yrR`nTsKTOJ{@4j^$!;bfOBCV%!ifU|jLMsm@xu|QZr zv=h5Q^GQi}jlqM8=9^-_1r)3jzC7$Rf0K}3Z%DR1LI6d;=a63w>^vGXIIJjc*6cnW zvwg2ZG6!F{9NeFh?>E>q!nM2O>|H__D#fh^89;HPp?a0#ZDMEn>v75WMT(ZOAKG2S zCc@}hh7E=0vwt#wt4v;|NXn7}(U#?_O*F{&YkoW_`EYlW`eVYzUchE;b&H~%qY33f zjaAW^{GCK;pKvNj=6EegxoB2bF}o57CrUFEq<7jun;@k_0+P3411+3O$0M@6!1Q&G z@H2|>_|nUF(_#cS&eQoyHf8&~u a1n>tWahL$F{-EIi0000*EbGP!D!JsKpbnu`g7 zV7h_Vi?n!Eiaf|5%!Ix3In&!1cON0mDn!Pkz9OItDZ)$?4G<3kk}CPTL6@t3O_1d; zv=m7dERYG&AU%)_bNrJ*UA?)SpmGYD0YNtIUS?1y1&LS17V~Dn%DaoqZrA<++w=`s WOL3VJE@sjI0000J{M_~ulI0$cY0 zhtc5`%+Np=`HMbJ-~OaG<1#jyrS$$67Lb#m7>ZX`2nvh%P8s9IG%44iKb;_%jFI*Y za)eu9g`n^R&xFiYqt@WXmCgnz` zk;xBo^J*^-=6|aUUh=s+mgD~PCRm4J{wqP@aVzv9M8FD|A6s?y4jPbv^_pS!%^tvDyO8znCIpWDLY0uH(mOzu;nC(VYqLV@oa%gP{g<~P1<#6 z&m>5tVq`pn9N~Xqu5X2W_7zFvGqn_FZmSu^=o?|L!h?I)nelg7e7}R~a#d6Ax8kGmsXJbdyQtV6DUjePdy-%x4N$q*5+0%mKc z%)wy*3D_smF#Epm&F}p- zd?fmhmHq27I+;Ea5HhMj_d4AhDGtY!8f#}$MWz-RzmQtUyMKIJA%u2Iqq&ivpUBUW zby9rXTS803kaox!n<$Tu1@YCQdNx4QXZu5CvOpB4If(B@Tm%1e8{yANr(MS z@(!1tP*!a*vqo~o#5{A)Df$$OZHghtQCOwJuMIvgvG$0$XY}q;;QI7>A1>7e*tiG5 zPEfIVJSP@Oz{(d3J8v}!$-QT08eFfe1s^O1UH4F*U{AV(@Pv>FT1-3wu7b%H znj16^aNRO|069Pq7ZWWFPXN`jVS0$j08SIJm2bkoAHG>%mbO3n8~ohh1%-|``kSC3 Q#sB~S07*qoM6N<$f^gSY1ONa4 diff --git a/tools/geo/py/geo.py b/tools/geo/py/geo.py index 14bb2009..c77e42bf 100644 --- a/tools/geo/py/geo.py +++ b/tools/geo/py/geo.py @@ -380,7 +380,7 @@ geo = { 'CL': 'crop(left)', 'CL-AQ': 'extend()', 'CM': 'extend()', - 'CN': 'crop(756) # equal padding', + 'CN': 'cut(1024, 0, 0, 341); resize(); copy(145, 73, 885, 679, 740, 606, 142, 209)', 'CO': 'crop()', 'CP': 'extend()', 'CR': 'crop(left)', @@ -566,7 +566,7 @@ geo = { 'RU': 'crop()', 'RW': 'crop(right)', 'SA': 'crop()', - 'SB': 'extend(left, right)', + 'SB': 'extend(left, right); copy(103, 972, 206, 1024, 103, 52, 0, 1536); copy(1842, 0, 1945, 52, 103, 52, 1945, 460)', 'SC': 'resize()', 'SD': 'cut(0, 0, 683, 0); resize()', 'SE': 'crop(768)', @@ -585,7 +585,7 @@ geo = { 'SR': 'crop()', 'SS': 'crop(left)', 'ST': 'resize(); copy(832, 320, 1216, 704, 384, 384, 272, 320); copy(1344, 320, 1728, 704, 384, 384, 624, 320)', - 'SUHH': 'slice(341)', + 'SUHH': 'crop(right); copy(85, 0, 597, 512, 1024, 1024, 0, 0)', 'SV': 'crop()', 'SX': 'crop(left)', 'SY': 'slice(614)', @@ -681,7 +681,7 @@ geo = { 'Belarusian': 'Belarus', 'Bemba': '', 'Bengali': 'Bangladesh', - 'Berber': '', + 'Berber': 'Morocco', # ?, one of multiple 'Bhojpuri': '', 'Bicolano': 'Philippines', 'Bodo': '', @@ -694,16 +694,16 @@ geo = { 'Cantonese': 'China', 'Catalan': 'Spain', 'Central Khmer': 'Cambodia', - 'Chaozhou': '', + 'Chaozhou': 'China', 'Chechen': 'Russia', - 'Cherokee': 'United Stated', - 'Cheyenne': '', - 'Chhattisgarhi': '', + 'Cherokee': 'United States', + 'Cheyenne': 'United States', + 'Chhattisgarhi': 'India', 'Chinese': 'China', - 'Cornish': '', + 'Cornish': 'United Kingdom', 'Corsican': 'France', 'Cree': 'Canada', - 'Creek': '', + 'Creek': 'United States', 'Creole': '', 'Creoles and pidgins': '', 'Croatian': 'Croatia', @@ -745,17 +745,17 @@ geo = { 'Guarani': 'Paraguay', 'Gujarati': 'India', 'Gumatj': '', - 'Gunwinggu': '', + 'Gunwinggu': 'Australia', 'Haitian': 'Haiti', 'Hakka': 'China', 'Haryanvi': '', - 'Hassanya': '', - 'Hausa': '', + 'Hassanya': 'Mauritania', + 'Hausa': 'Nigeria', 'Hawaiian': 'United States', 'Hebrew': 'Israel', 'Hindi': 'India', 'Hmong': '', - 'Hokkien': '', + 'Hokkien': 'China', 'Hopi': 'United States', 'Hungarian': 'Hungary', 'Iban': '', @@ -789,20 +789,20 @@ geo = { 'Konkani': 'India', 'Korean': 'South Korea', 'Korowai': 'Papua New Guinea', - 'Kriolu': '', + 'Kriolu': 'Cape Verde', 'Kru': '', 'Kudmali': '', 'Kuna': '', - 'Kurdish': 'Turkey', # ? one of multiple + 'Kurdish': 'Turkey', # ?, one of multiple 'Kwakiutl': '', 'Kyrgyz': 'Kyrgyzstan', - 'Ladakhi': '', + 'Ladakhi': 'India', 'Ladino': '', 'Lao': 'Laos', 'Latin': 'Italy', 'Latvian': 'Latvia', 'Limbu': '', - 'Lingala': '', + 'Lingala': 'Democratic Republic of the Congo', 'Lithuanian': 'Lithuania', 'Low German': 'Germany', 'Luxembourgish': 'Luxemburg', @@ -814,7 +814,7 @@ geo = { 'Malay': 'Malaysia', 'Malayalam': '', 'Malecite-Passamaquoddy': '', - 'Malinka': '', + 'Malinka': 'Guinea', 'Maltese': 'Malta', 'Manchu': '', 'Mandarin': 'China', @@ -839,16 +839,16 @@ geo = { 'Montagnais': '', 'More': 'Burkina Faso', 'Morisyen': '', - 'Nagpuri': '', + 'Nagpuri': 'India', 'Nahuatl': '', 'Nama': '', - 'Navajo': '', + 'Navajo': 'United States', 'Naxi': 'China', 'Ndebele': '', 'Neapolitan': 'Italy', 'Nenets': '', 'Nepali': 'Nepal', - 'Nisga\'a': '', + 'Nisga\'a': 'Canada', 'None': '', 'Norse, Old': '', 'North American Indian': '', @@ -892,31 +892,31 @@ geo = { 'Serbo-Croatian': 'Yugoslavia', 'Serer': '', 'Shanghainese': 'China', - 'Shanxi': '', + 'Shanxi': 'China', 'Shona': 'Zimbabwe', - 'Shoshoni': '', + 'Shoshoni': 'United States', 'Sicilian': 'Italy', 'Sindarin': '', - 'Sindhi': '', + 'Sindhi': 'Pakistan', 'Sinhala': 'Sri Lanka', - 'Sioux': '', + 'Sioux': 'United States', 'Slovak': 'Slovakia', 'Slovenian': 'Slovenia', 'Somali': 'Somalia', 'Songhay': '', 'Soninke': '', 'Sorbian': 'Germany', - 'Sotho': '', + 'Sotho': 'Lesotho', 'Sousson': '', 'Spanish': 'Spain', 'Sranan': '', - 'Swahili': '', + 'Swahili': 'Kenya', # ?, one of multiple 'Swedish': 'Sweden', 'Swiss German': 'Switzerland', 'Sylheti': '', 'Tagalog': 'Philippines', 'Tajik': 'Tajikistan', - 'Tamashek': '', + 'Tamashek': 'Algeria', # ?, one of multiple 'Tamil': 'Sri Lanka', 'Tarahumara': '', 'Tatar': 'Russia', @@ -945,12 +945,12 @@ geo = { 'Visayan': '', 'Washoe': '', 'Welsh': 'Wales', - 'Wolof': 'Senegal', # ? one of multiple + 'Wolof': 'Senegal', # ?, one of multiple 'Xhosa': 'South Africa', 'Yakut': '', 'Yapese': '', 'Yiddish': 'Israel', - 'Yoruba': '', + 'Yoruba': 'Nigeria', 'Zulu': 'South Africa' }, 'other': ['European Union', 'Metropolitan France', 'UK'],