diff --git a/conf/core/AttributeConflation.conf b/conf/core/AttributeConflation.conf
index 691b878..d8822d8 100644
--- a/conf/core/AttributeConflation.conf
+++ b/conf/core/AttributeConflation.conf
@@ -1,14 +1,8 @@
{
- "#": "Note that some of these settings match the defaults in ConfigOptions.asciidoc and don't necessary need to be here, but it is",
- "#": "helpful to have all of them grouped here while still experimenting with Attribute Conflation.",
- "attribute.conflation.aggressive.highway.joining": "false",
- "attribute.conflation.allow.ref.geometry.changes.for.bridges": "true",
- "attribute.conflation.allow.reviews.by.score": "false",
+ "#": "Only add entries here that different default values than the options in ConfigOptions.asciidoc",
"building.force.contained.match": "true",
"building.keep.more.complex.geometry.when.auto.merging": "false",
- "building.match.threshold": "0.6",
"building.merge.many.to.many.matches": "true",
- "building.outline.update.op.remove.building.relations": "true",
"conflate.post.ops": "$(conflate.post.ops);hoot::IdSwapOp;hoot::RemoveElementsVisitor;hoot::RemoveUnknown2Visitor",
"conflate.use.data.source.ids.1": "false",
"conflate.use.data.source.ids.2": "true",
@@ -17,7 +11,6 @@
"highway.merge.tags.only": "true",
"poi.polygon.allow.cross.conflation.merging": "true",
"poi.polygon.auto.merge.many.poi.to.one.poly.matches": "true",
- "remove.elements.visitor.chain.element.criteria": "false",
"remove.elements.visitor.element.criteria": "hoot::TagKeyCriterion;hoot::ReviewRelationCriterion",
"remove.elements.visitor.recursive": "false",
"review.score.criterion.invert.thresholding": "true",
@@ -25,6 +18,7 @@
"review.score.criterion.min.threshold": "0.35",
"tag.key.criterion.keys": "hoot:multilinestring",
"tag.merger.default": "hoot::OverwriteTag1Merger",
+ "tag.merger.overwrite.exclude": "source;source:imagery;source:imagery:datetime;source:imagery:id;source:imagery:sensor",
"way.joiner": "hoot::WayJoinerAdvanced",
"writer.include.circular.error.tags": "false",
"#": "end"