--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/LevenshteinStreetnameHelper.java 2015/02/28 17:08:59 2411 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/LevenshteinStreetnameHelper.java 2015/07/23 09:37:09 2639 @@ -1,7 +1,5 @@ package dk.daoas.daoadresseservice; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import dk.daoas.daoadresseservice.beans.SearchRequest; @@ -9,21 +7,30 @@ public class LevenshteinStreetnameHelper implements StreetnameHelper { - AddressSearch search; + //AddressSearch search; public LevenshteinStreetnameHelper(AddressSearch search ) { - this.search = search; + //this.search = search; } @Override public String proposeStreetName(SearchRequest request, SearchResult result) { -; result.levenshtein = true; for(String vej : request.streetNames.keySet() ) { - if ( StringUtils.getLevenshteinDistance(request.vasketVejnavn, vej) == 1) { - System.out.println("Levenstein: " + request.vasketVejnavn + "->" + vej); + if ( StringUtils.getLevenshteinDistance(result.vasketVejnavn, vej) == 1) { + System.out.println("Levenstein: " + result.vasketVejnavn + "->" + vej + " distance=1"); + result.levenshteinDistance = 1; + return vej; + } + } + + //prøv igen med distance=2 + for(String vej : request.streetNames.keySet() ) { + if ( StringUtils.getLevenshteinDistance(result.vasketVejnavn, vej) == 2) { + System.out.println("Levenstein: " + result.vasketVejnavn + "->" + vej + " distance=2"); + result.levenshteinDistance = 2; return vej; } }