--- dao/DaoAdresseService/WebContent/WEB-INF/web.xml	2015/02/16 20:42:25	2314
+++ dao/DaoAdresseService/WebContent/WEB-INF/web.xml	2015/02/26 07:06:48	2376
@@ -785,8 +785,6 @@
     <res-type>javax.sql.DataSource</res-type>
     <res-auth>Container</res-auth>
   </resource-ref>
-
-
   <filter>
     <filter-name>SetCharacterEncoding</filter-name>
     <filter-class>org.apache.catalina.filters.SetCharacterEncodingFilter</filter-class>
@@ -795,6 +793,35 @@
       <param-value>UTF-8</param-value>
     </init-param>
   </filter>
-
-
-</web-app>
+  <filter-mapping>
+    <filter-name>SetCharacterEncoding</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  
+  	<context-param>  
+	<description>Bool: use google geocoding to help with streetnames</description>
+	<param-name>useGoogle</param-name>
+	<param-value>true</param-value>
+	</context-param>
+	
+	 <context-param>  
+	<description>Bool: use OSM geocoding to help with streetnames</description>
+	<param-name>useOpenStreetMaps</param-name>
+	<param-value>true</param-value>
+	</context-param>
+	
+	<context-param>  
+	<description>Int: Timeout for HTTPRequest (ms)</description>
+	<param-name>osmTimeout</param-name>
+	<param-value>750</param-value>
+	</context-param>
+	
+	<context-param>  
+	<description>String: Base for nominatim URL</description>
+	<param-name>nominatimBase</param-name>
+	<param-value>http://nominatim.openstreetmap.org</param-value>
+	</context-param>
+  
+  
+  
+</web-app>
\ No newline at end of file