Mercurial > dive4elements > river
diff flys-artifacts/ChangeLog @ 1639:12235a2ace21
Add positional-conflict-awareness when merging Facets in attribute
of a collection. Apply "first come first serve"-rule.
flys-artifacts/trunk@2824 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 26 Sep 2011 13:17:55 +0000 |
| parents | f45bbc80bd3d |
| children | fb296bdf815f |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Sep 26 13:10:40 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Sep 26 13:17:55 2011 +0000 @@ -1,3 +1,14 @@ +2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Add positional-conflict-awareness when merging Facets for a + FLYSArtifactCollection. First come first serve. + + * src/main/java/de/intevation/flys/collections/AttributeWriter.java: + (writeFacets): First, sort incoming facets into 2 groups: + "genuinely new" and "already there", then for each new check + whether the position is already taken. If so, push "up" (position++) + until no conflict exists anymore. + 2011-09-26 Ingo Weinzierl <ingo@intevation.de> flys/issue296 (Karte: Bezeichnungen verbessern) @@ -11,7 +22,7 @@ src/main/resources/messages_de.properties: Added strings for the wsplgen and barriers WMS layers. -2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> +2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> Fix (revert) access to position in ManagedDomFacet.