@Override public void endTree(NodeRef left, NodeRef right) { String name = left == null ? right.name() : left.name(); if (NodeRef.ROOT.equals(name)) { BoundingBox lbounds = new ReferencedEnvelope(this.leftEnv); BoundingBox rbounds = new ReferencedEnvelope(this.rightEnv); BoundingBox merged; if (lbounds.isEmpty()) { merged = rbounds; } else if (rbounds.isEmpty()) { merged = lbounds; } else { merged = new ReferencedEnvelope(lbounds); merged.include(rbounds); } this.result = new DiffSummary<BoundingBox, BoundingBox>(lbounds, rbounds, merged); } }
@Override public void endTree(NodeRef left, NodeRef right) { String name = left == null ? right.name() : left.name(); if (NodeRef.ROOT.equals(name)) { BoundingBox lbounds = new ReferencedEnvelope(this.leftEnv); BoundingBox rbounds = new ReferencedEnvelope(this.rightEnv); BoundingBox merged; if (lbounds.isEmpty()) { merged = rbounds; } else if (rbounds.isEmpty()) { merged = lbounds; } else { merged = new ReferencedEnvelope(lbounds); merged.include(rbounds); } this.diffBoundsResult = new DiffSummary<BoundingBox, BoundingBox>(lbounds, rbounds, merged); } }
@Test public void testPathFiltering() throws Exception { insertAndAdd(l1Modified); geogig.command(CommitOp.class).call(); insert(l2Modified); testPathFiltering("HEAD~3", "HEAD", l1Modified.getBounds(), linesName); testPathFiltering("HEAD", "WORK_HEAD", l2Modified.getBounds(), linesName); testPathFiltering("HEAD~3", "HEAD~2", null, linesName); testPathFiltering("HEAD~3", "HEAD~2", null, linesName); String head = points1_modified_commit.getId().toString(); BoundingBox expected = points1.getBounds(); expected.include(points1_modified.getBounds()); testPathFiltering(head + "^", head, expected, pointsName); testPathFiltering(head + "^", head, null, linesName); testPathFiltering("HEAD^", "HEAD", null, pointsName); }
@Test public void testPathFiltering() throws Exception { insertAndAdd(l1Modified); geogig.command(CommitOp.class).call(); insert(l2Modified); testPathFiltering("HEAD~3", "HEAD", l1Modified.getBounds(), linesName); testPathFiltering("HEAD", "WORK_HEAD", l2Modified.getBounds(), linesName); testPathFiltering("HEAD~3", "HEAD~2", null, linesName); testPathFiltering("HEAD~3", "HEAD~2", null, linesName); String head = points1_modified_commit.getId().toString(); BoundingBox expected = points1.getBounds(); expected.include(points1_modified.getBounds()); testPathFiltering(head + "^", head, expected, pointsName); testPathFiltering(head + "^", head, null, linesName); testPathFiltering("HEAD^", "HEAD", null, pointsName); }