[mkgmap] branch upstream updated (21243da -> 58c6665)

[Sebastiaan Couwenberg]

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

sebastic pushed a change to branch upstream
in repository mkgmap.

      from  21243da   Imported Upstream version 0.0.0+svn3598
       new  58c6665   Imported Upstream version 0.0.0+svn3620

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:
 doc/addresses/address.txt                          |    6 +
 doc/options.txt                                    |   41 +-
 doc/styles/internal-tags.txt                       |    4 +-
 resources/help/en/options                          |   31 +-
 resources/mkgmap-version.properties                |    4 +-
 resources/styles/default/inc/address               |    4 +-
 resources/styles/default/inc/water_lines           |    1 +
 resources/styles/default/inc/water_polygons        |    3 +-
 resources/styles/default/lines                     |   13 +-
 resources/styles/default/points                    |    5 +-
 resources/styles/default/polygons                  |    5 +
 src/uk/me/parabola/imgfmt/app/Coord.java           |   33 +-
 src/uk/me/parabola/imgfmt/app/CoordNode.java       |    2 +
 src/uk/me/parabola/imgfmt/app/net/NETFile.java     |    4 +-
 .../me/parabola/imgfmt/app/net/NETFileReader.java  |   90 +-
 .../me/parabola/imgfmt/app/net/NumberPreparer.java |  178 +-
 src/uk/me/parabola/imgfmt/app/net/Numbers.java     |  393 +++-
 src/uk/me/parabola/imgfmt/app/net/RoadDef.java     |  216 ++-
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |   39 +-
 .../parabola/imgfmt/app/trergn/LinePreparer.java   |   16 +-
 src/uk/me/parabola/imgfmt/app/trergn/Polyline.java |   16 +-
 src/uk/me/parabola/mkgmap/CommandArgsReader.java   |    6 +-
 src/uk/me/parabola/mkgmap/build/Locator.java       |    4 +-
 src/uk/me/parabola/mkgmap/build/LocatorUtil.java   |    6 +
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    |  119 +-
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |   18 +-
 .../mkgmap/filters/LinePreparerFilter.java         |    2 +-
 .../mkgmap/filters/LineSizeSplitterFilter.java     |    2 +-
 src/uk/me/parabola/mkgmap/general/CityInfo.java    |  115 ++
 src/uk/me/parabola/mkgmap/general/MapDetails.java  |   37 +-
 src/uk/me/parabola/mkgmap/general/MapElement.java  |   13 +-
 src/uk/me/parabola/mkgmap/general/MapPoint.java    |   12 +-
 src/uk/me/parabola/mkgmap/general/MapRoad.java     |   87 +-
 src/uk/me/parabola/mkgmap/general/ZipCodeInfo.java |   77 +
 src/uk/me/parabola/mkgmap/main/MapMaker.java       |  174 --
 src/uk/me/parabola/mkgmap/main/StyleTester.java    |    7 +
 src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java |    4 +
 .../parabola/mkgmap/osmstyle/ExpressionRule.java   |    5 +
 src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java |    1 +
 src/uk/me/parabola/mkgmap/osmstyle/RuleSet.java    |   17 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  146 +-
 .../mkgmap/osmstyle/housenumber/ExtNumbers.java    | 1960 +++++++++++++++++++
 .../osmstyle/housenumber/HousenumberElem.java      |  110 ++
 .../osmstyle/housenumber/HousenumberGenerator.java | 2031 +++++++++++++++++---
 .../osmstyle/housenumber/HousenumberGroup.java     |  357 ++++
 .../osmstyle/housenumber/HousenumberIvl.java       |  502 +++++
 .../osmstyle/housenumber/HousenumberMatch.java     |  333 ++--
 .../osmstyle/housenumber/HousenumberRoad.java      |  803 ++++++++
 src/uk/me/parabola/mkgmap/reader/osm/Element.java  |   52 +-
 .../parabola/mkgmap/reader/osm/HighwayHooks.java   |    7 -
 .../mkgmap/reader/osm/HousenumberHooks.java        |  117 ++
 .../mkgmap/reader/osm/LinkDestinationHook.java     |   90 +-
 .../mkgmap/reader/osm/OsmMapDataSource.java        |   85 +-
 .../mkgmap/reader/osm/POIGeneratorHook.java        |   50 +-
 src/uk/me/parabola/mkgmap/reader/osm/Rule.java     |    2 +
 src/uk/me/parabola/mkgmap/reader/osm/Way.java      |    5 +-
 .../mkgmap/reader/osm/bin/OsmBinHandler.java       |   56 +-
 .../mkgmap/reader/osm/o5m/O5mBinHandler.java       |   14 +-
 .../mkgmap/reader/osm/xml/Osm5XmlHandler.java      |   42 +-
 .../parabola/mkgmap/reader/polish/RoadHelper.java  |   81 +-
 .../parabola/mkgmap/reader/test/AllElements.java   |   82 +-
 .../mkgmap/reader/test/ElementTestDataSource.java  |    2 +-
 .../MapPointKdTree.java => util/KdTree.java}       |   69 +-
 .../eval/BinaryOp.java => util/Locatable.java}     |   23 +-
 .../util/{MultiHashMap.java => MultiHashSet.java}  |   39 +-
 src/uk/me/parabola/util/ShapeSplitter.java         |   12 +
 test/func/lib/NumberReader.java                    |   44 +-
 test/main/NumberRangeTest.java                     |    7 +-
 .../imgfmt/app/net/NumberPreparerTest.java         |    6 +-
 .../uk/me/parabola/imgfmt/app/net/NumbersTest.java |  139 ++
 .../KdTreeTest.java}                               |   13 +-
 71 files changed, 7780 insertions(+), 1309 deletions(-)
 create mode 100644 src/uk/me/parabola/mkgmap/general/CityInfo.java
 create mode 100644 src/uk/me/parabola/mkgmap/general/ZipCodeInfo.java
 create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java
 create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberElem.java
 create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberGroup.java
 create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberIvl.java
 create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/housenumber/HousenumberRoad.java
 create mode 100644 src/uk/me/parabola/mkgmap/reader/osm/HousenumberHooks.java
 rename src/uk/me/parabola/{mkgmap/general/MapPointKdTree.java => util/KdTree.java} (73%)
 copy src/uk/me/parabola/{mkgmap/osmstyle/eval/BinaryOp.java => util/Locatable.java} (60%)
 copy src/uk/me/parabola/util/{MultiHashMap.java => MultiHashSet.java} (57%)
 create mode 100644 test/uk/me/parabola/imgfmt/app/net/NumbersTest.java
 rename test/uk/me/parabola/{mkgmap/general/MapPointKdTreeTest.java => util/KdTreeTest.java} (86%)

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