[mkgmap] branch upstream updated (28f661f -> bb420e6)

[Bas Couwenberg]

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

sebastic pushed a change to branch upstream
in repository mkgmap.

      from  28f661f   Imported Upstream version 0.0.0+svn3706
       new  bb420e6   Imported Upstream version 0.0.0+svn3741

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .idea/dictionaries/steve.xml                       |   1 +
 .idea/inspectionProfiles/Mapping.xml               | 143 +++++++++--
 .idea/misc.xml                                     |   3 +-
 Makefile                                           |   1 +
 resources/help/en/options                          | 286 +++++++++++----------
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/water_lines           |   3 +-
 src/uk/me/parabola/imgfmt/app/Area.java            |   5 +-
 .../parabola/imgfmt/app/BufferedImgFileReader.java |  14 +-
 src/uk/me/parabola/imgfmt/app/ImgFileReader.java   |   2 +-
 .../imgfmt/app/labelenc/CodeFunctions.java         |  10 +-
 src/uk/me/parabola/imgfmt/app/lbl/LBLFile.java     |   6 +-
 .../me/parabola/imgfmt/app/lbl/LBLFileReader.java  |   7 +-
 src/uk/me/parabola/imgfmt/app/map/Map.java         |  22 +-
 src/uk/me/parabola/imgfmt/app/trergn/TREFile.java  |  13 +-
 .../parabola/imgfmt/app/trergn/TREFileReader.java  |  24 +-
 src/uk/me/parabola/imgfmt/mps/Block.java           |  78 ------
 src/uk/me/parabola/imgfmt/mps/MapBlock.java        |   6 +-
 src/uk/me/parabola/imgfmt/mps/MapsetBlock.java     |   4 +-
 .../FeatureKind.java => imgfmt/mps/MpsBlock.java}  |  27 +-
 src/uk/me/parabola/imgfmt/mps/MpsFile.java         |  13 +-
 src/uk/me/parabola/imgfmt/mps/MpsFileReader.java   |  36 ++-
 src/uk/me/parabola/imgfmt/mps/ProductBlock.java    |   6 +-
 src/uk/me/parabola/imgfmt/sys/ImgHeader.java       |  44 +++-
 src/uk/me/parabola/io/FileBlock.java               |  80 ++++++
 src/uk/me/parabola/io/StructuredOutputStream.java  |  26 +-
 src/uk/me/parabola/mkgmap/build/MapArea.java       |  15 +-
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    |  18 +-
 src/uk/me/parabola/mkgmap/build/MapSplitter.java   |  28 +-
 src/uk/me/parabola/mkgmap/combiners/Combiner.java  |   3 +
 src/uk/me/parabola/mkgmap/combiners/FileInfo.java  |  24 +-
 .../me/parabola/mkgmap/combiners/GmapiBuilder.java | 283 ++++++++++++++++++++
 .../parabola/mkgmap/combiners/GmapsuppBuilder.java |  25 +-
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |   4 +
 .../me/parabola/mkgmap/combiners/MdxBuilder.java   |   4 +
 .../parabola/mkgmap/combiners/OverviewBuilder.java |   7 +-
 .../me/parabola/mkgmap/combiners/TdbBuilder.java   |   7 +-
 .../parabola/mkgmap/filters/ShapeMergeFilter.java  |  31 ++-
 src/uk/me/parabola/mkgmap/main/Main.java           |  46 ++--
 .../mkgmap/reader/osm/OsmMapDataSource.java        |  14 +-
 .../mkgmap/reader/osm/o5m/O5mBinHandler.java       |  52 ++--
 src/uk/me/parabola/tdbfmt/Block.java               | 121 ---------
 src/uk/me/parabola/tdbfmt/CopyrightBlock.java      |  22 +-
 src/uk/me/parabola/tdbfmt/CopyrightSegment.java    |   3 +-
 src/uk/me/parabola/tdbfmt/DetailMapBlock.java      |  20 +-
 src/uk/me/parabola/tdbfmt/HeaderBlock.java         |  40 +--
 src/uk/me/parabola/tdbfmt/OverviewMapBlock.java    |  24 +-
 src/uk/me/parabola/tdbfmt/RBlock.java              |  11 +-
 src/uk/me/parabola/tdbfmt/TBlock.java              |  15 +-
 src/uk/me/parabola/tdbfmt/TdbFile.java             | 138 +++++-----
 test/func/ArgsTest.java                            |   6 +
 test/func/SimpleTest.java                          |  19 +-
 test/func/StructureTest.java                       |   5 +-
 test/func/files/GmapsuppTest.java                  | 118 +++------
 test/func/files/TdbTest.java                       |  18 +-
 test/func/route/SimpleRouteTest.java               |  13 +-
 test/func/sources/TestSourceTest.java              |   8 +-
 57 files changed, 1169 insertions(+), 837 deletions(-)
 delete mode 100644 src/uk/me/parabola/imgfmt/mps/Block.java
 copy src/uk/me/parabola/{mkgmap/reader/osm/FeatureKind.java => imgfmt/mps/MpsBlock.java} (59%)
 create mode 100644 src/uk/me/parabola/io/FileBlock.java
 create mode 100644 src/uk/me/parabola/mkgmap/combiners/GmapiBuilder.java
 delete mode 100644 src/uk/me/parabola/tdbfmt/Block.java

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