[mkgmap] 02/04: Merge tag 'upstream/0.0.0+svn3706'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mkgmap.

commit ecddb91055ec4eef826c8099cd1650b96021ef9b
Merge: e7f4cd8 28f661f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 1 18:31:16 2016 +0100

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

 doc/options.txt                                    |   8 ++
 doc/styles/internal-tags.txt                       |   3 +-
 resources/help/en/options                          |   6 +
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/water_polygons        |   2 +-
 src/uk/me/parabola/imgfmt/app/Area.java            |  70 +++++++---
 src/uk/me/parabola/mkgmap/build/MapArea.java       | 146 ++++++++++++++++++++-
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    |  28 +++-
 src/uk/me/parabola/mkgmap/build/MapSplitter.java   |  28 ++--
 .../parabola/mkgmap/filters/ShapeMergeFilter.java  |   7 +-
 src/uk/me/parabola/mkgmap/general/LevelInfo.java   |   4 +-
 src/uk/me/parabola/mkgmap/general/MapShape.java    |  19 +++
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  21 +++
 src/uk/me/parabola/mkgmap/osmstyle/TypeReader.java |   4 +-
 .../mkgmap/osmstyle/function/AreaSizeFunction.java |  23 +++-
 .../mkgmap/reader/osm/MultiPolygonRelation.java    |   4 +
 .../parabola/mkgmap/reader/osm/SeaGenerator.java   |  16 ++-
 src/uk/me/parabola/mkgmap/reader/osm/Way.java      |  15 +++
 .../mkgmap/filters/ShapeMergeFilterTest.java       |   2 +-
 19 files changed, 359 insertions(+), 51 deletions(-)

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