X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Flibaddressinput%2Fsrc%2Fcpp%2Fsrc%2Fregion_data_constants.cc;h=e21d4b8daeb267fa97914ea02aa3cd2a8c8d595a;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=cabee28c86bc8069d964709ab6959c5b2c7455b8;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/libaddressinput/src/cpp/src/region_data_constants.cc b/src/third_party/libaddressinput/src/cpp/src/region_data_constants.cc
index cabee28..e21d4b8 100644
--- a/src/third_party/libaddressinput/src/cpp/src/region_data_constants.cc
+++ b/src/third_party/libaddressinput/src/cpp/src/region_data_constants.cc
@@ -16,6 +16,9 @@
 
 #include "region_data_constants.h"
 
+#include <libaddressinput/address_field.h>
+#include <libaddressinput/util/basictypes.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <map>
@@ -24,10 +27,8 @@
 #include <utility>
 #include <vector>
 
-#include <libaddressinput/address_field.h>
-#include <libaddressinput/util/basictypes.h>
-
 #include "address_field_util.h"
+#include "format_element.h"
 #include "lookup_key.h"
 
 namespace i18n {
@@ -43,9 +44,8 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"en\""
       "}"));
   region_data.insert(std::make_pair("AD", "{"
-      "\"fmt\":\"%N%n%O%n%A%n%Z %S\","
-      "\"require\":\"AS\","
-      "\"state_name_type\":\"parish\","
+      "\"fmt\":\"%N%n%O%n%A%n%Z %C\","
+      "\"require\":\"A\","
       "\"zipex\":\"AD100,AD501,AD700\","
       "\"posturl\":\"http://www.correos.es/comun/CodigosPostales/1010_s-CodPostal.asp\?Provincia=\","
       "\"languages\":\"ca\""
@@ -119,7 +119,7 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"nl~pap\""
       "}"));
   region_data.insert(std::make_pair("AX", "{"
-      "\"fmt\":\"%O%n%N%n%A%nAX-%Z %C%n\u00c5LAND\","
+      "\"fmt\":\"%O%n%N%n%A%nAX-%Z %C%n\\u00c5LAND\","
       "\"require\":\"ACZ\","
       "\"zipex\":\"22150,22550,22240,22710,22270,22730,22430\","
       "\"posturl\":\"http://www.posten.ax/department.con\?iPage=123\","
@@ -329,7 +329,7 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"ar~fr\""
       "}"));
   region_data.insert(std::make_pair("DK", "{"
-      "\"fmt\":\"%O%n%N%n%A%n%Z %C\","
+      "\"fmt\":\"%N%n%O%n%A%n%Z %C\","
       "\"require\":\"ACZ\","
       "\"zipex\":\"8660,1566\","
       "\"posturl\":\"http://www.postdanmark.dk/da/Privat/Kundeservice/postnummerkort/Sider/Find-postnummer.aspx\","
@@ -634,7 +634,7 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"ar\""
       "}"));
   region_data.insert(std::make_pair("JP", "{"
-      "\"fmt\":\"\u3012%Z%n%S%C%n%A%n%O%n%N\","
+      "\"fmt\":\"\\u3012%Z%n%S%C%n%A%n%O%n%N\","
       "\"lfmt\":\"%N%n%O%n%A%n%C, %S%n%Z\","
       "\"require\":\"ACSZ\","
       "\"state_name_type\":\"prefecture\","
@@ -1062,8 +1062,9 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"sr-Cyrl~sr-Latn\""
       "}"));
   region_data.insert(std::make_pair("RU", "{"
-      "\"fmt\":\"%Z %C  %n%A%n%O%n%N\","
+      "\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\","
       "\"require\":\"ACZ\","
+      "\"state_name_type\":\"oblast\","
       "\"zipex\":\"125075,247112,103375\","
       "\"posturl\":\"http://info.russianpost.ru/servlet/department\","
       "\"languages\":\"ru\""
@@ -1242,7 +1243,9 @@ std::map<std::string, std::string> InitRegionData() {
       "\"languages\":\"sw~en\""
       "}"));
   region_data.insert(std::make_pair("UA", "{"
-      "\"fmt\":\"%Z %C%n%A%n%O%n%N\","
+      "\"fmt\":\"%N%n%O%n%A%n%C%n%S%n%Z\","
+      "\"require\":\"ACZ\","
+      "\"state_name_type\":\"oblast\","
       "\"zipex\":\"15432,01055,01001\","
       "\"posturl\":\"http://services.ukrposhta.com/postindex_new/\","
       "\"languages\":\"uk~ru\""
@@ -1396,8 +1399,10 @@ struct SelectFirst {
 
 std::vector<std::string> InitRegionCodes() {
   std::vector<std::string> region_codes(GetAllRegionData().size());
-  std::transform(GetAllRegionData().begin(), GetAllRegionData().end(),
-                 region_codes.begin(), SelectFirst());
+  std::transform(GetAllRegionData().begin(),
+                 GetAllRegionData().end(),
+                 region_codes.begin(),
+                 SelectFirst());
   return region_codes;
 }