[libcitygml] 10/35: Merge tag 'upstream/1.4.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libcitygml.

commit 8983d510f093c88ceb24cc729f532ec529b61abd
Merge: 9188509 21abc1f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 24 16:29:28 2015 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

 CMakeLists.txt                                     |   2 +-
 TODO.md                                            |  18 ++--
 sources/CMakeLists.txt                             |   4 +
 sources/include/citygml/citygmlfactory.h           |   4 +-
 sources/include/citygml/geometry.h                 |  10 +-
 sources/include/citygml/linestring.h               |  40 +++++++
 sources/include/parser/attributes.h                |   4 +
 sources/include/parser/cityobjectelementparser.h   |   1 +
 .../include/parser/delayedchoiceelementparser.h    |   7 ++
 sources/include/parser/geocoordinatetransformer.h  |   1 +
 sources/include/parser/linestringelementparser.h   |  36 +++++++
 sources/include/parser/nodetypes.h                 |   9 +-
 sources/src/citygml/citygmlfactory.cpp             |  35 ++++++-
 sources/src/citygml/geometry.cpp                   |  22 +++-
 sources/src/citygml/linestring.cpp                 |  63 +++++++++++
 sources/src/citygml/object.cpp                     |  12 +--
 sources/src/parser/attributes.cpp                  |  10 +-
 sources/src/parser/cityobjectelementparser.cpp     |  68 ++++++++----
 sources/src/parser/geocoordinatetransformer.cpp    |  28 +++++
 sources/src/parser/geometryelementparser.cpp       |  25 +----
 .../src/parser/implicitgeometryelementparser.cpp   |  24 ++++-
 sources/src/parser/linestringelementparser.cpp     | 116 +++++++++++++++++++++
 sources/src/parser/nodetypes.cpp                   |  17 ++-
 sources/src/parser/sequenceparser.cpp              |   3 +
 24 files changed, 485 insertions(+), 74 deletions(-)

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