--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/admin/ServiceConfig.java	2015/02/23 14:39:49	2346
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/ServiceConfig.java	2015/11/26 12:50:05	2784
@@ -1,10 +1,11 @@
 package dk.daoas.daoadresseservice.admin;
 
+import dk.thoerup.circuitbreaker.config.BreakerConfig;
 import dk.thoerup.webconfig.ConfigVariable;
 
 
 
-public class ServiceConfig {
+public class ServiceConfig implements BreakerConfig {
 	
 	@ConfigVariable
 	public boolean useGoogle;
@@ -12,4 +13,37 @@
 	@ConfigVariable
 	public boolean useOpenStreetMaps;
 	
+	@ConfigVariable(mandatory=false)
+	public boolean useMetaphone = false; //default false
+	
+	@ConfigVariable
+	public int osmTimeout;
+	
+	@ConfigVariable(mandatory=false, readonly=true)
+	public String googleApiUser;
+	
+	@ConfigVariable(mandatory=false, hideValue=true)
+	public String googleApiKey;
+	
+	@ConfigVariable
+	public String nominatimBase;
+	
+	@ConfigVariable(mandatory=false)
+	public String notifyEmail;
+	
+	
+	//Styrer om vi må bruge nærmeste litra hvis der ikke var direkte match herpå
+	@ConfigVariable(mandatory=false)
+	public boolean nearestLitra = true;
+
+	@Override
+	public int getTimeout() {
+		return 60000;
+	}
+
+	@Override
+	public int getTreshold() {
+		return 5;
+	}
+	
 }