Commit 0d979567 authored by patrick.lambert's avatar patrick.lambert
Browse files

bug fix in loadinf shape file

parent 2ec99465
basin_id,basin_name,function
1,Off Florida,WINTERING
2,Mid-Atlantic Bight ,WINTERING
2,Mid-Atlantic Bight,WINTERING
3,Scotian Shelf,WINTERING
4,Bay of Fundy,SUMMERING
5,Off Newfoundland and Labrador,SUMMERING
......
......@@ -324,18 +324,19 @@ public class RIOBasinNetworkWithContinent extends RIOBasinNetwork {
// append the shape for each basin
if (mapRiverBasin != null) {
if (mapRiverBasin.containsKey(record.getName()))
riverBasin.getShape().append(mapRiverBasin.get(record.getName()), true);
// riverBasin.getShape().append(mapRiverBasin.get(record.getName()), true);
riverBasin.setShape(mapRiverBasin.get(record.getName()));
else {
System.out.println(record.getName() + "does not exist in river basin shape");
System.out.println(record.toString());
System.exit(1);
;
}
}
if (mapInshoreBasin != null) {
if (mapInshoreBasin.containsKey(record.getName()))
inshoreBasin.getShape().append(mapInshoreBasin.get(record.getName()), true);
// inshoreBasin.getShape().append(mapInshoreBasin.get(record.getName()), true);
inshoreBasin.setShape(mapInshoreBasin.get(record.getName()));
else {
System.out.println(record.getName() + "does not exist in sea basin shape");
System.out.println(record.toString());
......@@ -375,7 +376,7 @@ public class RIOBasinNetworkWithContinent extends RIOBasinNetwork {
if (mapOffshoreBasin.containsKey(name)) {
System.out.println(name);
// offshorebasin.getShape().append(mapInshoreBasin.get(name), true);
offshorebasin.setShape(mapInshoreBasin.get(name));
offshorebasin.setShape(mapOffshoreBasin.get(name));
} else {
System.out.println(name + "does not exist in " + offshoreBasinShpFile);
System.exit(1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment