[Schmitzm-commits] r1988 - in trunk/schmitzm-adresses/src: main/java/de/schmitzm/adresses test/java/de/schmitzm/adresses

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2012-05-09 21:15:45 +0200 (Wed, 09 May 2012)
New Revision: 1988

Modified:
   trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
   trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
Log:
Kleiner fix mit Emmerichin AddrStringUtil

Modified: trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
===================================================================
--- trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2012-05-05 20:41:15 UTC (rev 1987)
+++ trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2012-05-09 19:15:45 UTC (rev 1988)
@@ -494,7 +494,7 @@
 		ort = ort.replaceAll("\\((.*)\\)", "xx$1"); // neu
 
 		ort = ort.replaceAll("(?i)freiburg.+(i\\.?.?b(\\.||reisgau))[^r]", "freiburg im breisgau"); // neu
-		ort = ort.replaceAll("(?i)^\\s*emmerich.+", "emmerich");
+		ort = ort.replaceAll("(?i)^\\s*emmerich$", "emmerich am rhein");
 
 		ort = ort.replaceAll("\\brbge\\.?\\b", "ruebenberge");
 		ort = ort.replaceAll("\\bopf\\.?\\b", "oberpfalz");

Modified: trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
===================================================================
--- trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2012-05-05 20:41:15 UTC (rev 1987)
+++ trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2012-05-09 19:15:45 UTC (rev 1988)
@@ -283,6 +283,9 @@
 		assertEquals("hattersheimxxmain", AddrStringUtil.normalizeOrt("Hattersheim (Main)"));
 		assertEquals("amrumberg", AddrStringUtil.normalizeOrt("Am Rumberg"));
 
+		assertEquals("emmerichxxrhein", AddrStringUtil.normalizeOrt("emmerich"));
+		assertEquals("emmerichxxrhein", AddrStringUtil.normalizeOrt("emmerich am rhein"));
+		
 		assertEquals("sanktaugustin", AddrStringUtil.normalizeOrt("St. Augustin"));
 		assertEquals("freiburgxxbreisgau", AddrStringUtil.normalizeOrt("Freiburg im Breisgau"));
 		assertEquals("freiburgxxbreisgau", AddrStringUtil.normalizeOrt("Freiburg i. Breisgau"));