[mkgmap] 03/06: Merge tag 'upstream/0.0.0+svn3436'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mkgmap.

commit f78a01eacd5b1b1eee35284600f45e589ceda334
Merge: c7f4227 0a97c7e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 6 14:39:50 2015 +0100

    Merge tag 'upstream/0.0.0+svn3436'
    
    Upstream version 0.0.0+svn3436

 doc/options.txt                                    | 23 +++---
 doc/styles/rules-filters.txt                       | 22 ++++++
 doc/tutorial/publish.txt                           | 23 ++++--
 resources/help/en/options                          | 17 +++--
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/relations                 |  3 +-
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    | 27 +++----
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  6 +-
 .../parabola/mkgmap/osmstyle/WrongAngleFixer.java  | 11 +++
 .../osmstyle/actions/NotContainedFilter.java       | 82 +++++++++++++++++++++
 .../mkgmap/osmstyle/actions/ValueBuilder.java      |  3 +
 .../mkgmap/osmstyle/actions/ValueItem.java         |  2 +-
 src/uk/me/parabola/mkgmap/reader/osm/Element.java  | 46 ++++++------
 .../mkgmap/reader/osm/OsmMapDataSource.java        | 60 +++++++++++-----
 .../mkgmap/reader/osm/bin/OsmBinHandler.java       | 56 +++++++--------
 .../mkgmap/reader/osm/o5m/O5mBinHandler.java       | 14 ++--
 .../mkgmap/reader/osm/xml/Osm5XmlHandler.java      | 42 +++++------
 test/func/route/SimpleRouteTest.java               |  2 +-
 .../osmstyle/actions/NotContainedFilterTest.java   | 83 ++++++++++++++++++++++
 19 files changed, 388 insertions(+), 138 deletions(-)

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