Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -ra0d08c65b3c00a4d2b000fad060d93310402818a -rf5055dc70a6eaec772be99f03e9fef0e093305d7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision a0d08c65b3c00a4d2b000fad060d93310402818a) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision f5055dc70a6eaec772be99f03e9fef0e093305d7) @@ -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