EDIT

CondensedDistributionCompose for FloraCuba

CondensedDistributionCompose for FloraCuba

Implement natural ordering for distributions in data portal #5677

#5479 preliminar solution for user defined presenceAbsence terms vocabularies

resolving conflicts after merge of ticket_4716 into develop

Fix TransientObjectException for distribution map #5357

Test do not yet work fully and are commented

Cleanup description generics (related to #5357)

Further adapt to new jackson and new lucene version #4716

#2273 removing HACK: hardcoded distribution status colors for cyprus a no longer needed

#5112 - hiding fall back areas from the hierachchic distribution representation

#2988 avoiding NPE and allowing empty omitlevels (bug fix)

minor code cleaning

#4408 removing occurences of fallbackAreaMarkerType in methods and renaming parameter in controller

merging fallbackAreaFilter rule into hiddenArea rule

all rules separated

implementing fallbackArea rule into DescriptionUtility.filterDistrubution for EuroPlusMed - #4408

correcting the cleanup of sub areas labes in condensed distributions

applying subAreaPreference exclusively for maps

correctly assigning INTRODUCED_NATURALIZED to n=naturalizes for condensed distribution - #3907

removing obsolete warning from log - #3907

some bugfixes in CondensedDistribution composition code - #3907

minor documentation cleaning

composition of condensed distribution fully implemented - #3907

base framework for condensedDistributions implemented - #4911

performance: avoiding second distribution filtering when creating the DistributionServiceRequestParameterString - #4911

replacing 'non-java-doc by {@inheritDoc}

Improve E+M post import methods #3979

Add E+M vocabulary uuid to E+M-Transformer

further performance improvements: - better autoinitialization of collection items, - fixing bug in AdvancedBeanInitializer: adding missing LEFT to JOIN FETCH

speed up of DistributionTree.orderAsTree() by factor 1.6

performance improvement by 42% by using default initstrategy for composeDistributionInfoFor()

• added wrapper for map service query to have access to the data points
  • used data points as parameters for the bounding box of the point distribution map

merge-update from trunk

minor

merge-update from trunk

merge PresenceTerm and AbsenceTerm #4521

removing old obsolte code

updating TODO

solving #4294 (order of map legend entries conforms to term order)

first attempt to fix #4294 (order of map legend entries conforms to term order)

throwing exception in case vocabulary is not found

adapt method name

refactoring - related to #4268 (allow defining custom presence and absence term colors for EditGeoServiceUtilities)

implementation for #4268 (allow defining custom presence and absence term colors for EditGeoServiceUtilities) and removing obsolete termservice parameters

reverting temp fix made for https://dev.e-taxonomy.eu/trac/ticket/2707#comment:24 by configuration in EditGeoServiceUtilities - but leaving code for now

preliminar solution to avoid problems due to #4263 (GeoServiceArea and IGeoServiceAreaMapping should manage mapping information per layer)

fix country mapping

fixing #4172 (NPE in ext/edit/mapServiceParameters/taxonOccurrencesFor/{uuid})

fix missing idInVocabulary for countries; implement country mapping for EditGeoService (#3452, #3651)

adapring initstrategy for DescriptionInfoDTO service

DistributionInfoForTaxon methods implemented in services and controllers

done: #4006 (remove general map parameters from distribution and occurrence map service methods)

implementing third rule for #3904 (EuroMed: Implement filtering rules for Distributions)

implementing rule 2 and 3 for #3904 (EuroMed: Implement filtering rules for Distributions) - all existing test running successfully

removing almost all hardcoded cyprus specialties

fixing bugs regarding the shape file mapper as preparation for removing hardoded layer information for cyprus

add logging for failing test #3831

IGNORE areas for which no layer is mapped

removing unnesscary default baselayers - finally deleting commented lines

commenting also method with important information related to #965 (Return type of partOf, kindOf etc. has to be decided)

fixing class cast problem with hibernate proxy instance

fixing tests after removing baselayer & doNotReuseStyles is a workaround for a problem in the EDIT MapService, see https://dev.e-taxonomy.eu/trac/ticket/2707#comment:24

removing unnesscary default baselayers and forcing layernames to be lowercase

using idInVocabulary in EditGeoService (see #3805) and implementing mapper tool to read shapefiles and to attach the contained attribute information to NamedAreas

rename FieldObservation -> FieldUnit #3351

adding recordBasis to SpecimenOrObservationBase and removing some DerivedUnit classes (all #3378) and adding kindOfUnit to SpecimenOrObservationBase (except for according termType and vocabulary) #3568.

remove TdwgArea and add termType and idInVocabulary (#2998, #3478, #3479, #3539) in ext

Merge trunk into CDM 3.3

also preferring computed distributions in getOrderedDistributions()

renaming methods and some documentation

filtering descriptionElements by computed marker

removing obsoltete methods and cleaning up

fixing #3176 (NPE in EditGeoService.registerDerivedUnitLocations())

harmonizing method names

add MarkerTypes to descriptionService scopes

some changes in GeoServiceArea

add geoservice mapping functionality

javadoc

preliminary implementation for generic geoMapService mapping (supports no multiple layer areas)

add GeoServiceArea + tests

avoiding NPE when area not in vocabulary

removing test code

skipping site-depoy in maven release plugin

fixing #2377: Distribution map color in cyprus portal again broken

fixing #2328 (NPE in DerivedUnitBase)

color for reported in error

cleaning includes

integration test needed

fixing 3) "Colors for status should appear according to .." of #2273

code cleaning and fixing problem with unknown wms layers

preliminary implementation for cyprus maps

bugfix for missing level info in geo service

getting all SpecimenOrObservationBases for a Taxon

Less generics in occurrence map creation

fixing uri query parameter encoding problem

changing color

service for occurrence maps

refactoring of package structure in ext