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

tille pushed a commit to branch master
in repository mkgmap.

commit 4dbb6396b0b0415dee0a9c2fd848fa6cd293babe
Merge: f025e91 a379d02
Author: Andreas Tille <ti...@debian.org>
Date:   Thu Mar 6 18:47:16 2014 +0100

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

 .idea/codeStyleSettings.xml                        |    1 -
 .idea/inspectionProfiles/Mapping.xml               |   27 +-
 .idea/runConfigurations/mkgmap.xml                 |    2 +-
 doc/options.txt                                    |   10 +-
 extra/src/uk/me/parabola/util/CollationRules.java  |  372 ++++++
 resources/help/en/options                          |    5 +
 resources/mkgmap-version.properties                |    4 +-
 resources/sort/README                              |   56 +
 resources/sort/cp0.txt                             |   81 ++
 resources/sort/cp1250.txt                          |  200 +--
 resources/sort/cp1251.txt                          |  312 +++--
 resources/sort/cp1252.txt                          |  275 ++--
 resources/sort/cp1253.txt                          |  142 +++
 resources/sort/cp1254.txt                          |  133 ++
 resources/sort/cp1255.txt                          |  158 +++
 resources/sort/cp1256.txt                          |  282 ++--
 resources/sort/cp1257.txt                          |  129 ++
 resources/sort/cp1258.txt                          |  134 ++
 src/uk/me/parabola/imgfmt/Utils.java               |  100 ++
 src/uk/me/parabola/imgfmt/app/Area.java            |   73 +-
 src/uk/me/parabola/imgfmt/app/Coord.java           |  362 +++++-
 src/uk/me/parabola/imgfmt/app/CoordNode.java       |    7 +
 src/uk/me/parabola/imgfmt/app/Label.java           |   45 +-
 .../imgfmt/app/labelenc/AnyCharsetEncoder.java     |    9 +-
 .../parabola/imgfmt/app/labelenc/BaseEncoder.java  |    4 +-
 .../imgfmt/app/labelenc/CodeFunctions.java         |   22 +-
 .../parabola/imgfmt/app/labelenc/EncodedText.java  |   26 +-
 .../imgfmt/app/labelenc/Format6Encoder.java        |    8 +-
 .../imgfmt/app/labelenc/Simple8Encoder.java        |   30 -
 .../parabola/imgfmt/app/labelenc/Utf8Encoder.java  |   11 +-
 src/uk/me/parabola/imgfmt/app/lbl/City.java        |    4 +
 src/uk/me/parabola/imgfmt/app/lbl/LBLFile.java     |    4 +-
 .../me/parabola/imgfmt/app/lbl/LBLFileReader.java  |   19 +-
 src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java  |   46 +-
 src/uk/me/parabola/imgfmt/app/net/NETFile.java     |   27 +-
 src/uk/me/parabola/imgfmt/app/net/NODHeader.java   |   39 +-
 src/uk/me/parabola/imgfmt/app/net/RoadDef.java     |    8 +-
 src/uk/me/parabola/imgfmt/app/net/RouteArc.java    |  227 ++--
 src/uk/me/parabola/imgfmt/app/net/RouteCenter.java |   10 +-
 src/uk/me/parabola/imgfmt/app/net/RouteNode.java   |   78 +-
 .../parabola/imgfmt/app/net/RouteRestriction.java  |   19 +-
 src/uk/me/parabola/imgfmt/app/net/TableA.java      |  114 +-
 src/uk/me/parabola/imgfmt/app/net/TableC.java      |   17 +-
 src/uk/me/parabola/imgfmt/app/srt/SRTFile.java     |    2 +-
 src/uk/me/parabola/imgfmt/app/srt/Sort.java        |  348 +++--
 src/uk/me/parabola/imgfmt/app/srt/SrtSortKey.java  |   14 +-
 .../parabola/imgfmt/app/trergn/LinePreparer.java   |   53 +-
 src/uk/me/parabola/imgfmt/app/trergn/Polyline.java |    4 +-
 .../parabola/imgfmt/app/trergn/RGNFileReader.java  |    4 +-
 .../me/parabola/imgfmt/app/trergn/Subdivision.java |   11 +-
 src/uk/me/parabola/log/Logger.java                 |    4 +
 src/uk/me/parabola/mkgmap/build/MapArea.java       |   61 +-
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    |   15 +-
 .../me/parabola/mkgmap/combiners/MdrBuilder.java   |   39 +-
 .../mkgmap/filters/DouglasPeuckerFilter.java       |    8 +-
 .../mkgmap/filters/LinePreparerFilter.java         |   68 +-
 .../mkgmap/filters/LineSizeSplitterFilter.java     |    4 +-
 .../mkgmap/filters/LineSplitterFilter.java         |    3 +-
 .../mkgmap/filters/PolygonSplitterBase.java        |   47 +-
 .../PreserveHorizontalAndVerticalLinesFilter.java  |    6 -
 .../mkgmap/filters/RemoveObsoletePointsFilter.java |  103 +-
 .../parabola/mkgmap/filters/ShapeMergeFilter.java  |  468 +++++++
 .../parabola/mkgmap/filters/SmoothingFilter.java   |    2 +-
 src/uk/me/parabola/mkgmap/general/AreaClipper.java |    9 +
 src/uk/me/parabola/mkgmap/general/LevelInfo.java   |    9 +-
 src/uk/me/parabola/mkgmap/general/LineClipper.java |   42 +-
 src/uk/me/parabola/mkgmap/general/MapDetails.java  |   15 +-
 src/uk/me/parabola/mkgmap/general/MapLine.java     |   24 +-
 .../mkgmap/general/MapPointFastFindMap.java        |  202 ---
 .../me/parabola/mkgmap/general/MapPointKdTree.java |    4 +-
 .../parabola/mkgmap/general/MapPointMultiMap.java  |   59 -
 src/uk/me/parabola/mkgmap/general/MapShape.java    |  153 +--
 .../me/parabola/mkgmap/general/PolygonClipper.java |   23 +-
 src/uk/me/parabola/mkgmap/general/RoadNetwork.java |   79 +-
 .../me/parabola/mkgmap/main/AbstractTestMap.java   |    5 +-
 src/uk/me/parabola/mkgmap/main/MapMaker.java       |   10 +-
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |   25 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  | 1017 ++++++++-------
 .../parabola/mkgmap/osmstyle/WrongAngleFixer.java  | 1340 ++++++++++++++++++++
 .../mkgmap/osmstyle/function/AreaSizeFunction.java |    2 +-
 .../mkgmap/osmstyle/function/IsClosedFunction.java |    3 +-
 .../osmstyle/housenumber/HousenumberGenerator.java |   29 +-
 src/uk/me/parabola/mkgmap/reader/dem/DEM.java      |   20 +-
 src/uk/me/parabola/mkgmap/reader/osm/CoordPOI.java |   27 +-
 .../parabola/mkgmap/reader/osm/ElementSaver.java   |    7 +-
 .../parabola/mkgmap/reader/osm/HighwayHooks.java   |    4 +-
 .../mkgmap/reader/osm/LinkDestinationHook.java     |   56 +-
 .../mkgmap/reader/osm/MultiPolygonRelation.java    |  334 ++---
 .../me/parabola/mkgmap/reader/osm/OsmHandler.java  |    2 +-
 .../mkgmap/reader/osm/POIGeneratorHook.java        |    6 +-
 .../mkgmap/reader/osm/RestrictionRelation.java     |   46 +-
 .../parabola/mkgmap/reader/osm/SeaGenerator.java   |  135 +-
 .../mkgmap/reader/osm/SeaPolygonRelation.java      |    1 +
 src/uk/me/parabola/mkgmap/reader/osm/Way.java      |   49 +-
 .../reader/osm/boundary/BoundaryConverter.java     |    2 +-
 .../mkgmap/reader/osm/boundary/BoundaryDiff.java   |    5 +-
 .../reader/osm/boundary/BoundaryElement.java       |    2 +-
 .../reader/osm/boundary/BoundaryElementSaver.java  |    2 +-
 .../reader/osm/boundary/BoundaryFile2Gpx.java      |    2 +-
 .../reader/osm/boundary/BoundaryPreprocessor.java  |    2 +-
 .../reader/osm/boundary/BoundaryQuadTree.java      |    4 +-
 .../reader/osm/boundary/BoundaryRelation.java      |   20 +-
 .../mkgmap/reader/osm/boundary/BoundarySaver.java  |   51 +-
 .../mkgmap/reader/osm/boundary/BoundaryUtil.java   |   30 -
 .../mkgmap/reader/polish/PolishMapDataSource.java  |   22 +-
 .../parabola/mkgmap/reader/polish/RoadHelper.java  |    2 +-
 src/uk/me/parabola/mkgmap/scan/TokenScanner.java   |   11 +-
 .../mkgmap/sea/optional/PrecompSeaGenerator.java   |   14 +-
 .../mkgmap/sea/optional/PrecompSeaMerger.java      |   26 +-
 .../mkgmap/sea/optional/PrecompSeaSaver.java       |   26 +-
 src/uk/me/parabola/mkgmap/srt/SrtTextReader.java   |  203 +--
 src/uk/me/parabola/util/ElementQuadTreeNode.java   |    5 +-
 src/uk/me/parabola/util/GpxCreator.java            |  131 +-
 src/uk/me/parabola/util/Java2DConverter.java       |  240 ++--
 src/uk/me/parabola/util/QuadTreeNode.java          |    5 +-
 test/func/SimpleTest.java                          |   14 +-
 test/func/route/SimpleRouteTest.java               |   50 +-
 test/main/SortTest.java                            |  273 ++++
 test/uk/me/parabola/imgfmt/UtilsTest.java          |   56 +
 .../imgfmt/app/labelenc/Format6EncoderTest.java    |   51 +
 .../parabola/imgfmt/app/labelenc/LabelEncTest.java |   43 +
 .../me/parabola/imgfmt/app/srt/SortExpandTest.java |   10 +-
 test/uk/me/parabola/imgfmt/app/srt/SortTest.java   |  113 +-
 .../parabola/imgfmt/app/srt/SrtCollatorTest.java   |  142 +++
 .../mkgmap/filters/ShapeMergeFilterTest.java       |  385 ++++++
 .../uk/me/parabola/mkgmap/general/MapLineTest.java |   51 +
 .../parabola/mkgmap/general/PointInShapeTest.java  |  286 -----
 .../mkgmap/osmstyle/RuleFileReaderTest.java        |   15 +-
 .../me/parabola/mkgmap/scan/TokenScannerTest.java  |   46 +
 .../me/parabola/mkgmap/srt/SrtTextReaderTest.java  |   29 +-
 .../me/parabola/mkgmap/typ/TypTextReaderTest.java  |    7 +-
 131 files changed, 7765 insertions(+), 3244 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to