Merge branch 'develop' into BasinImprovement

src/main/java/environment/RIOBasinNetworkWithContinent.java

@@ -381,17 +381,20 @@ public class RIOBasinNetworkWithContinent extends RIOBasinNetwork {
 			for (int i = 0; i < headers.length; i++)
 				System.out.println("  " + fields[i] + " \t<-> " + headers[i]);
 
-			while (scanner.hasNext()) {
-				basin_id = scanner.nextInt(); // gid
-				name = scanner.next();
-				function = scanner.next();
-
+			while (scanner.hasNextLine()) {
+				 fields = scanner.nextLine().split(",");
+			
+				basin_id = Integer.valueOf(fields[0]); // gid
+				name = fields[1];
+				function = fields[2];
+				//System.out.println(basin_id + " " + name);
+				
 				OffshoreBasin offshorebasin = new OffshoreBasin(basin_id, name, OffshoreBasinFunction.valueOf(function));
 
 				if (mapOffshoreBasin != null) {
 					if (mapOffshoreBasin.containsKey(name.trim())) {
 						// offshorebasin.getShape().append(mapInshoreBasin.get(name), true);
-						offshorebasin.setShape(mapOffshoreBasin.get(name.strip()));
+						offshorebasin.setShape(mapOffshoreBasin.get(name.trim()));
 					} else {
 						System.out.println(name + "does not exist in " + offshoreBasinShpFile);
 						for (String nameMap : mapOffshoreBasin.keySet()) {