Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1638:f45bbc80bd3d | 1639:12235a2ace21 |
|---|---|
| 1 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> | |
| 2 | |
| 3 Add positional-conflict-awareness when merging Facets for a | |
| 4 FLYSArtifactCollection. First come first serve. | |
| 5 | |
| 6 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: | |
| 7 (writeFacets): First, sort incoming facets into 2 groups: | |
| 8 "genuinely new" and "already there", then for each new check | |
| 9 whether the position is already taken. If so, push "up" (position++) | |
| 10 until no conflict exists anymore. | |
| 11 | |
| 1 2011-09-26 Ingo Weinzierl <ingo@intevation.de> | 12 2011-09-26 Ingo Weinzierl <ingo@intevation.de> |
| 2 | 13 |
| 3 flys/issue296 (Karte: Bezeichnungen verbessern) | 14 flys/issue296 (Karte: Bezeichnungen verbessern) |
| 4 | 15 |
| 5 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | 16 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: |
| 9 src/main/resources/messages_de_DE.properties, | 20 src/main/resources/messages_de_DE.properties, |
| 10 src/main/resources/messages_en.properties, | 21 src/main/resources/messages_en.properties, |
| 11 src/main/resources/messages_de.properties: Added strings for the wsplgen | 22 src/main/resources/messages_de.properties: Added strings for the wsplgen |
| 12 and barriers WMS layers. | 23 and barriers WMS layers. |
| 13 | 24 |
| 14 2011-09-23 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 25 2011-09-26 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 15 | 26 |
| 16 Fix (revert) access to position in ManagedDomFacet. | 27 Fix (revert) access to position in ManagedDomFacet. |
| 17 | 28 |
| 18 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: | 29 * src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java: |
| 19 (getPosition): Do not add prefix when querying position ("pos") | 30 (getPosition): Do not add prefix when querying position ("pos") |