--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/03/13 12:57:01	2442
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayer.java	2015/05/11 08:05:01	2539
@@ -54,18 +54,18 @@
 				Address a = new Address();
 				a.id = res.getInt(1);
 				a.vejnavn = vejnavnCache.getInstance( res.getString(2) );
-				a.husnr = res.getInt(3);
+				a.husnr = (short) res.getInt(3);
 				a.husnrbogstav = husnrbogstavCache.getInstance( res.getString(4) );
-				a.kommunekode = res.getInt(5);
-				a.vejkode = res.getInt(6);
-				a.postnr = res.getInt(7);
-				a.gadeid = res.getLong(8);
+				a.kommunekode = (short) res.getInt(5);
+				a.vejkode = (short)res.getInt(6);
+				a.postnr = (short)res.getInt(7);
+				a.gadeid = res.getInt(8);
 				a.distributor = distributorCache.getInstance(res.getString(9));
-				a.dbkBane = res.getInt(10);
+				a.dbkBane = (short) res.getInt(10);
 				a.koreliste = korelisteCache.getInstance( res.getString(11) );
 				a.rute = ruteCache.getInstance( res.getString(12) );
-				a.latitude = res.getDouble(13);
-				a.longitude = res.getDouble(14);
+				a.latitude = (float) res.getDouble(13);
+				a.longitude = (float) res.getDouble(14);
 				
 				//a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
 				
@@ -108,7 +108,7 @@
 			while (res.next()) {		
 				
 				AliasBean ab = new AliasBean();
-				ab.postnr = res.getInt(1);
+				ab.postnr = res.getShort(1);
 				ab.vejnavn = vejCache.getInstance( res.getString(2) );
 				ab.aliasVejnavn = vejCache.getInstance( res.getString(3) );
 							
@@ -161,7 +161,7 @@
 				ExtendedBean eb = new ExtendedBean();
 				eb.orgId = res.getInt(1);
 				eb.targetId = res.getInt(2);
-				eb.afstand = res.getDouble(3);
+				eb.afstand = (float) res.getDouble(3);
 				eb.transport = transportCache.getInstance(res.getString(4));
 							
 				list.add(eb);
@@ -175,7 +175,7 @@
 		}
 	}
 	
-	public static Map<Integer,HundredePctBean> get100PctList() throws SQLException {
+	public static Map<Short,HundredePctBean> get100PctList() throws SQLException {
 		String sql = "SELECT postnr,UPPER(distributor) as distributor,rute,koreliste,dbkbane " + 
 					 "FROM bogleveringer.adresser_udenfor_daekning";
 		
@@ -184,7 +184,7 @@
 				) {
 			ResultSet res = stmt.executeQuery(sql);
 	
-			Map<Integer,HundredePctBean> map = new HashMap<Integer,HundredePctBean>();
+			Map<Short, HundredePctBean> map = new HashMap<Short,HundredePctBean>();
 			
 			DeduplicateHelper<String> distributorCache = new DeduplicateHelper<String>();
 			
@@ -192,11 +192,11 @@
 				
 				
 				HundredePctBean bean = new HundredePctBean();
-				bean.postnr = res.getInt(1);
+				bean.postnr = (short) res.getInt(1);
 				bean.distributor = distributorCache.getInstance(res.getString(2));
 				bean.rute = res.getString(3);
 				bean.koreliste = res.getString(4);
-				bean.dbkBane = res.getInt(5);			
+				bean.dbkBane = (short)res.getInt(5);			
 							
 				map.put(bean.postnr, bean);
 			}