[libcitygml] 02/07: Merge tag 'upstream/2.0.4'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libcitygml.

commit 3beebfd81a8c39d51ae18201f87f291a89f2c570
Merge: 9423f98 f848bf1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 20 16:32:13 2017 +0100

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4

 .gitignore                                         |   1 +
 .travis.yml                                        |  20 ++-
 CMakeLists.txt                                     |   4 +-
 osgplugin/README                                   |  22 ---
 osgplugin/ReaderWriterCityGML.cpp                  |  14 +-
 sources/CMakeLists.txt                             |  39 +++++-
 sources/include/citygml/appearancemanager.h        |   6 +-
 sources/include/citygml/appearancetarget.h         |  10 +-
 sources/include/citygml/attributesmap.h            |  55 ++++++++
 sources/include/citygml/citygml.h                  |   4 +-
 sources/include/citygml/citygml_api.h.in           |  10 +-
 sources/include/citygml/citygmlfactory.h           |   4 +-
 sources/include/citygml/citygmllogger.h            |  26 +++-
 sources/include/citygml/citymodel.h                |   2 +-
 sources/include/citygml/cityobject.h               |  91 ++++++------
 sources/include/citygml/enum_type_bitmask.h        |  48 +++++++
 sources/include/citygml/featureobject.h            |   4 +-
 sources/include/citygml/geometry.h                 |  10 +-
 sources/include/citygml/geometrymanager.h          |   2 +-
 sources/include/citygml/implictgeometry.h          |   2 +-
 sources/include/citygml/object.h                   |   7 +-
 sources/include/citygml/polygon.h                  |  24 +++-
 sources/include/citygml/polygonmanager.h           |   2 +-
 sources/include/citygml/tesselator.h               |   6 +-
 sources/include/citygml/texture.h                  |   2 +-
 sources/include/citygml/texturetargetdefinition.h  |   4 +-
 sources/include/parser/appearanceelementparser.h   |   4 +-
 sources/include/parser/citygmldocumentparser.h     |   2 +-
 sources/include/parser/citymodelelementparser.h    |   2 +-
 sources/include/parser/cityobjectelementparser.h   |   7 +-
 sources/include/parser/geometryelementparser.h     |   2 +-
 .../parser/georeferencedtextureelementparser.h     |   2 +-
 .../include/parser/implicitgeometryelementparser.h |   2 +-
 sources/include/parser/linearringelementparser.h   |   2 +-
 sources/include/parser/linestringelementparser.h   |   2 +-
 sources/include/parser/materialelementparser.h     |   2 +-
 sources/include/parser/nodetypes.h                 |   2 +
 sources/include/parser/polygonelementparser.h      |   2 +-
 sources/include/parser/textureelementparser.h      |   2 +-
 sources/src/citygml/appearance.cpp                 |   2 +-
 sources/src/citygml/appearancemanager.cpp          |  12 +-
 sources/src/citygml/appearancetarget.cpp           |  10 +-
 sources/src/citygml/attributesmap.cpp              | 109 +++++++++++++++
 sources/src/citygml/citygmlfactory.cpp             |  38 +++---
 sources/src/citygml/citymodel.cpp                  |   8 +-
 sources/src/citygml/cityobject.cpp                 | 152 +++++++++++----------
 sources/src/citygml/envelope.cpp                   |   2 +-
 sources/src/citygml/featureobject.cpp              |   4 +-
 sources/src/citygml/geometry.cpp                   |   6 +-
 sources/src/citygml/geometrymanager.cpp            |   8 +-
 sources/src/citygml/georeferencedtexture.cpp       |   2 +-
 sources/src/citygml/implictgeometry.cpp            |   4 +-
 sources/src/citygml/linearring.cpp                 |  12 +-
 sources/src/citygml/material.cpp                   |   2 +-
 sources/src/citygml/materialtargetdefinition.cpp   |   2 +-
 sources/src/citygml/object.cpp                     |  14 +-
 sources/src/citygml/polygon.cpp                    |  30 ++--
 sources/src/citygml/polygonmanager.cpp             |   8 +-
 sources/src/citygml/tesselator.cpp                 |   5 +-
 sources/src/citygml/texture.cpp                    |   4 +-
 sources/src/citygml/texturecoordinates.cpp         |   4 +-
 sources/src/citygml/texturetargetdefinition.cpp    |   4 +-
 sources/src/citygml/transformmatrix.cpp            |   2 +-
 sources/src/parser/addressparser.cpp               |  40 ++++--
 sources/src/parser/appearanceelementparser.cpp     |  14 +-
 sources/src/parser/attributes.cpp                  |   2 +-
 sources/src/parser/citygmldocumentparser.cpp       |   9 +-
 sources/src/parser/citygmlelementparser.cpp        |   4 +-
 sources/src/parser/citymodelelementparser.cpp      |   8 +-
 sources/src/parser/cityobjectelementparser.cpp     |  87 ++++++++++--
 sources/src/parser/delayedchoiceelementparser.cpp  |   2 +-
 sources/src/parser/geocoordinatetransformer.cpp    |  46 ++++---
 sources/src/parser/geometryelementparser.cpp       |   8 +-
 .../parser/georeferencedtextureelementparser.cpp   |   6 +-
 sources/src/parser/gmlfeaturecollectionparser.cpp  |  10 +-
 .../src/parser/implicitgeometryelementparser.cpp   |   6 +-
 sources/src/parser/linearringelementparser.cpp     |   6 +-
 sources/src/parser/linestringelementparser.cpp     |   6 +-
 sources/src/parser/materialelementparser.cpp       |   6 +-
 sources/src/parser/nodetypes.cpp                   |   6 +-
 sources/src/parser/parserxercesc.cpp               |  41 +++---
 sources/src/parser/polygonelementparser.cpp        |   6 +-
 sources/src/parser/sequenceparser.cpp              |   2 +-
 sources/src/parser/textureelementparser.cpp        |  12 +-
 test/citygmltest.cpp                               |   2 +-
 85 files changed, 807 insertions(+), 418 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git