Merge pull request #491 from lonvia/fix-missing-country-code

fix incompatible function call in country code lib

Author: lonvia

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

@@ -46,7 +46,7 @@ public class PhotonDoc {
     private String houseNumber;
     private Point centroid;
 
-    public PhotonDoc(long placeId, String osmType, long osmId, String tagKey, String tagValue, Map<String, String> name, String houseNumber, Map<String, String> address, Map<String, String> extratags, Envelope bbox, long parentPlaceId, double importance, CountryCode countryCode, Point centroid, long linkedPlaceId, int rankAddress) {
+    public PhotonDoc(long placeId, String osmType, long osmId, String tagKey, String tagValue, Map<String, String> name, String houseNumber, Map<String, String> address, Map<String, String> extratags, Envelope bbox, long parentPlaceId, double importance, String countryCode, Point centroid, long linkedPlaceId, int rankAddress) {
         if (extratags != null) {
             String place = extratags.get("place");
             if (place == null) {
@@ -71,7 +71,7 @@ public PhotonDoc(long placeId, String osmType, long osmId, String tagKey, String
         this.bbox = bbox;
         this.parentPlaceId = parentPlaceId;
         this.importance = importance;
-        this.countryCode = countryCode;
+        this.countryCode = CountryCode.getByCode(countryCode, false);
         this.centroid = centroid;
         this.linkedPlaceId = linkedPlaceId;
         this.rankAddress = rankAddress;

src/main/java/de/komoot/photon/nominatim/NominatimConnector.java

@@ -1,7 +1,6 @@
 package de.komoot.photon.nominatim;
 
 import com.google.common.collect.ImmutableList;
-import com.neovisionaries.i18n.CountryCode;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -148,7 +147,7 @@ public NominatimResult mapRow(ResultSet rs, int rownum) throws SQLException {
                     (Envelope) null,
                     rs.getLong("parent_place_id"),
                     0d, // importance
-                    CountryCode.getByCode(rs.getString("country_code")),
+                    rs.getString("country_code"),
                     (Point) null, // centroid
                     0,
                     30
@@ -192,7 +191,7 @@ public NominatimResult mapRow(ResultSet rs, int rowNum) throws SQLException {
                     envelope,
                     rs.getLong("parent_place_id"),
                     importance,
-                    CountryCode.getByCode(rs.getString("country_code")),
+                    rs.getString("country_code"),
                     (Point) DBUtils.extractGeometry(rs, "centroid"),
                     rs.getLong("linked_place_id"),
                     rs.getInt("rank_address")

src/test/java/de/komoot/photon/PhotonDocTest.java

@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 
+import com.neovisionaries.i18n.CountryCode;
 import org.hamcrest.core.IsEqual;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,6 +33,14 @@ public void testCompleteAddressCreatesStreetIfNonExistantBefore() {
         Assert.assertThat(doc.getStreet().get("name"), IsEqual.equalTo("test street"));    
     }
 
+    @Test
+    public void testAddCountryCode() {
+        PhotonDoc doc = new PhotonDoc(1, "W", 2, "highway", "residential", null, "4", null, null, null, 0, 30, "de", null, 0, 30);
+
+        Assert.assertNotNull(doc.getCountryCode());
+        Assert.assertEquals("DE", doc.getCountryCode().getAlpha2());
+    }
+
     private PhotonDoc createPhotonDocWithAddress(HashMap<String, String> address) {
         return new PhotonDoc(1, "W", 2, "highway", "residential", null, "4", address, null, null, 0, 30, null, null, 0, 30);
     }