--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java 2015/02/26 13:42:10 2386 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java 2015/02/26 14:43:20 2387 @@ -117,17 +117,26 @@ if (i>=len) //THN tilføjelse return result; - if (Character.isAlphabetic(indAdresse.charAt(i) )) { - if ( (i+1 == len || - (Character.isAlphabetic(indAdresse.charAt(i+1)) == false && indAdresse.charAt(i+1) != '.') - ) - ) { - result.litra = "" + indAdresse.charAt(i); - result.litra = result.litra.toUpperCase(); - i++; + if (Character.isAlphabetic(indAdresse.charAt(i) )) { + char current = Character.toUpperCase( indAdresse.charAt(i) ); + + if (current != 'Æ'&& current != 'Ø' && current != 'Å') { + if ( (i+1 == len || + (Character.isAlphabetic(indAdresse.charAt(i+1)) == false + /*&& indAdresse.charAt(i+1) != '.'*/) + ) + ) { + result.litra = "" + current; + i++; + } } } + // ignorer blanke og komma og punktum + while (i