--- dao/DaoAdresseService/WebContent/WEB-INF/web.xml	2015/02/12 13:57:32	2267
+++ dao/DaoAdresseService/WebContent/WEB-INF/web.xml	2015/02/26 13:11:45	2384
@@ -775,10 +775,46 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
   <display-name>DaoAdresseService</display-name>
   <description></description>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
   <resource-ref>
     <description>MySQL fulddaekning on info.dao.int</description>
     <res-ref-name>jdbc/fulddaekning</res-ref-name>
     <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>
+    <init-param>
+      <param-name>encoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+  </filter>
+  <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