Merge pull request #425 from Gerungofulus/countryCodes

Country codes

Author: lonvia

README.md

@@ -170,6 +170,7 @@ http://localhost:2322/api?q=berlin&osm_tag=tourism
         "name": "Berlin",
         "state": "Berlin",
         "country": "Germany",
+        "countrycode": "DE",
         "osm_key": "place",
         "osm_value": "city",
         "osm_type": "N",
@@ -192,6 +193,7 @@ http://localhost:2322/api?q=berlin&osm_tag=tourism
         "postcode": "14053",
         "state": "Berlin",
         "country": "Germany",
+        "countrycode": "DE",
         "osm_key": "leisure",
         "osm_value": "stadium",
         "osm_type": "W",

es/mappings.json

@@ -216,6 +216,10 @@
 					}
 				}
 			},
+			"countrycode": {
+				"type": "text",
+				"index": false
+			},
 			"housenumber": {
 				"type": "text",
 				"index": true,
@@ -482,4 +486,4 @@
 			}
 		}
 	}
-}
+}

src/main/java/de/komoot/photon/Constants.java

@@ -10,6 +10,7 @@ public class Constants {
     public static final String HOUSENUMBER = "housenumber";
     public static final String NAME = "name";
     public static final String COUNTRY = "country";
+    public static final String COUNTRYCODE = "countrycode";
     public static final String CITY = "city";
     public static final String STREET = "street";
     public static final String STATE = "state";

src/main/java/de/komoot/photon/Utils.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
+import com.neovisionaries.i18n.CountryCode;
 import com.vividsolutions.jts.geom.Envelope;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -47,6 +48,9 @@ public static XContentBuilder convert(PhotonDoc doc, String[] languages) throws
         writeName(builder, doc.getName(), languages);
         writeIntlNames(builder, doc.getCity(), "city", languages);
         writeIntlNames(builder, doc.getCountry(), "country", languages);
+        CountryCode countryCode = doc.getCountryCode();
+        if (countryCode != null)
+            builder.field(Constants.COUNTRYCODE, countryCode.getAlpha2());
         writeIntlNames(builder, doc.getState(), "state", languages);
         writeIntlNames(builder, doc.getStreet(), "street", languages);
         writeContext(builder, doc.getContext(), languages);

src/main/java/de/komoot/photon/utils/ConvertToJson.java

@@ -18,7 +18,7 @@
  */
 @Slf4j
 public class ConvertToJson implements OneWayConverter<SearchResponse, List<JSONObject>> {
-    private final static String[] KEYS_LANG_UNSPEC = {Constants.OSM_ID, Constants.OSM_VALUE, Constants.OSM_KEY, Constants.POSTCODE, Constants.HOUSENUMBER, Constants.OSM_TYPE};
+    private final static String[] KEYS_LANG_UNSPEC = {Constants.OSM_ID, Constants.OSM_VALUE, Constants.OSM_KEY, Constants.POSTCODE, Constants.HOUSENUMBER, Constants.COUNTRYCODE, Constants.OSM_TYPE};
     private final static String[] KEYS_LANG_SPEC = {Constants.NAME, Constants.COUNTRY, Constants.CITY, Constants.STREET, Constants.STATE};
     private final String lang;