Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.118.2.40 -r1.118.2.41 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 20 Jun 2016 08:47:21 -0000 1.118.2.40 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 21 Jun 2016 10:28:08 -0000 1.118.2.41 @@ -1078,16 +1078,12 @@ activityJSON.put("type", activity.getActivityTypeId()); Activity parentActivity = activity.getParentActivity(); - if (activity.isBranchingActivity() && (activity.getXcoord() == null)) { - // old branching is just a rectangle like Tool - // new branching has start and finish points, it's exploded + if (activity.isBranchingActivity()) { activityJSON.put("x", MonitoringAction.getActivityCoordinate(((BranchingActivity) activity).getStartXcoord())); activityJSON.put("y", MonitoringAction.getActivityCoordinate(((BranchingActivity) activity).getStartYcoord())); - } else if (activity.isOptionsWithSequencesActivity() && (activity.getXcoord() == null)) { - // old optional sequences is just a long rectangle - // new optional sequences has start and finish points, it's exploded + } else if (activity.isOptionsWithSequencesActivity()) { activityJSON.put("x", MonitoringAction .getActivityCoordinate(((OptionsWithSequencesActivity) activity).getStartXcoord())); activityJSON.put("y", MonitoringAction