Revision 68c48c6a
Added by Andreas Kohlbecker over 8 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java | ||
---|---|---|
9 | 9 |
|
10 | 10 |
package eu.etaxonomy.cdm.remote.controller; |
11 | 11 |
|
12 |
import io.swagger.annotations.Api; |
|
13 |
|
|
12 | 14 |
import java.awt.Color; |
13 | 15 |
import java.io.IOException; |
14 | 16 |
import java.util.Arrays; |
... | ... | |
43 | 45 |
import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO; |
44 | 46 |
import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO.InfoPart; |
45 | 47 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
48 |
import eu.etaxonomy.cdm.api.utility.DistributionOrder; |
|
46 | 49 |
import eu.etaxonomy.cdm.ext.geo.CondensedDistributionRecipe; |
47 | 50 |
import eu.etaxonomy.cdm.ext.geo.EditGeoServiceUtilities; |
48 | 51 |
import eu.etaxonomy.cdm.ext.geo.IEditGeoService; |
... | ... | |
62 | 65 |
import eu.etaxonomy.cdm.remote.editor.TermBaseListPropertyEditor; |
63 | 66 |
import eu.etaxonomy.cdm.remote.editor.TermBasePropertyEditor; |
64 | 67 |
import eu.etaxonomy.cdm.remote.l10n.LocaleContext; |
65 |
import io.swagger.annotations.Api; |
|
66 | 68 |
|
67 | 69 |
/** |
68 | 70 |
* TODO write controller documentation |
... | ... | |
230 | 232 |
* @param omitLevels |
231 | 233 |
* @param request |
232 | 234 |
* @param response |
235 |
* @param distributionOrder |
|
236 |
* Default is LABEL |
|
233 | 237 |
* @param recipe |
234 | 238 |
* The recipe for creating the condensed distribution status |
235 | 239 |
* @return |
... | ... | |
246 | 250 |
@RequestParam(value = "hiddenAreaMarkerType", required = false) DefinedTermBaseList<MarkerType> hideMarkedAreasList, |
247 | 251 |
@RequestParam(value = "omitLevels", required = false) Set<NamedAreaLevel> omitLevels, |
248 | 252 |
@RequestParam(value = "statusColors", required = false) String statusColorsString, |
253 |
@RequestParam(value = "distributionOrder", required = false, defaultValue="LABEL") DistributionOrder distributionOrder, |
|
249 | 254 |
@RequestParam(value = "recipe", required = false, defaultValue="EuroPlusMed") CondensedDistributionRecipe recipe, |
250 | 255 |
HttpServletRequest request, |
251 | 256 |
HttpServletResponse response) throws JsonParseException, JsonMappingException, IOException { |
... | ... | |
266 | 271 |
DistributionInfoDTO dto = geoService.composeDistributionInfoFor(parts, taxonUuid, |
267 | 272 |
subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels, |
268 | 273 |
presenceAbsenceTermColors, LocaleContext.getLanguages(), |
269 |
getDescriptionInfoInitStrategy(), recipe, null);
|
|
274 |
getDescriptionInfoInitStrategy(), recipe, distributionOrder);
|
|
270 | 275 |
|
271 | 276 |
mv.addObject(dto); |
272 | 277 |
|
Also available in: Unified diff
#5677 adding request paramter for DistributionOrder