This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository mkgmap.
from deb0c79 Imported Upstream version 0.0.0+svn2981 new 98bd598 Imported Upstream version 3333 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/codeStyleSettings.xml | 1 - .idea/copyright/profiles_settings.xml | 4 +- .idea/inspectionProfiles/Mapping.xml | 72 +- .idea/runConfigurations/mkgmap.xml | 2 +- doc/options.txt | 34 +- doc/resources/asciidoc/local-docbook45.conf | 28 +- doc/resources/docbook-xsl/fo.xsl | 22 +- doc/resources/make.param | 12 +- doc/styles/Makefile | 8 +- doc/styles/about.txt | 2 +- doc/styles/creating.txt | 58 +- doc/styles/internal-tags.txt | 135 + doc/styles/main.txt | 2 +- doc/styles/rules-filters.txt | 32 +- doc/styles/rules.txt | 257 +- doc/styles/style-manual.txt | 2 +- doc/typ-compiler.txt | 18 +- extra/src/uk/me/parabola/util/CollationRules.java | 437 + ivy.xml | 10 +- mkgmap.iml | 34 +- resources/chars/ascii/rowff.trans | 2 +- resources/chars/latin1/rowff.trans | 2 +- resources/help/en/options | 24 +- resources/installer/installer_template.nsi | 11 +- 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 + resources/sort/cp65001.txt | 11135 +++++++++++++++++++ resources/styles/default/inc/access | 92 +- resources/styles/default/inc/access_country | 22 + resources/styles/default/inc/address | 22 +- resources/styles/default/inc/name | 11 + resources/styles/default/lines | 16 +- resources/styles/default/points | 4 +- resources/styles/default/polygons | 10 +- resources/styles/default/relations | 2 +- scripts/download/buildwatch | 19 - scripts/download/mkdoc | 3 +- scripts/download/mksnap | 12 +- scripts/download/mksnapbranches | 3 +- scripts/download/mksnapindex | 110 - scripts/download/nightly | 11 + scripts/download/post-commit-svn-redis | 8 + scripts/download/pre-commit-crlf | 22 + scripts/download/skel-bot | 45 - scripts/download/skel-top | 47 - src/uk/me/parabola/imgfmt/MapFailedException.java | 19 +- src/uk/me/parabola/imgfmt/Utils.java | 101 + src/uk/me/parabola/imgfmt/app/Area.java | 73 +- .../parabola/imgfmt/app/BufferedImgFileWriter.java | 4 +- src/uk/me/parabola/imgfmt/app/Coord.java | 589 +- src/uk/me/parabola/imgfmt/app/CoordNode.java | 13 +- 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/mdr/MDRFile.java | 14 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr1.java | 20 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr10.java | 13 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr10Record.java | 4 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr11.java | 10 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java | 23 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr21.java | 8 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr22.java | 10 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr29.java | 6 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java | 25 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java | 22 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr5Record.java | 16 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr6.java | 6 +- src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java | 10 +- .../me/parabola/imgfmt/app/mdr/MdrMapSection.java | 23 + src/uk/me/parabola/imgfmt/app/mdr/MdrSection.java | 9 - src/uk/me/parabola/imgfmt/app/mdr/PrefixIndex.java | 26 +- src/uk/me/parabola/imgfmt/app/mdr/RecordBase.java | 1 + .../parabola/imgfmt/app/net/AccessTagsAndBits.java | 117 + .../imgfmt/app/net/GeneralRouteRestriction.java | 112 + src/uk/me/parabola/imgfmt/app/net/NETFile.java | 27 +- src/uk/me/parabola/imgfmt/app/net/NOD1Part.java | 56 +- src/uk/me/parabola/imgfmt/app/net/NODFile.java | 44 +- src/uk/me/parabola/imgfmt/app/net/NODHeader.java | 80 +- src/uk/me/parabola/imgfmt/app/net/RoadDef.java | 108 +- src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java | 709 ++ src/uk/me/parabola/imgfmt/app/net/RouteArc.java | 292 +- src/uk/me/parabola/imgfmt/app/net/RouteCenter.java | 53 +- src/uk/me/parabola/imgfmt/app/net/RouteNode.java | 434 +- .../parabola/imgfmt/app/net/RouteRestriction.java | 153 +- src/uk/me/parabola/imgfmt/app/net/TableA.java | 142 +- src/uk/me/parabola/imgfmt/app/net/TableB.java | 1 - src/uk/me/parabola/imgfmt/app/net/TableC.java | 21 +- .../me/parabola/imgfmt/app/srt/CodePosition.java | 12 +- src/uk/me/parabola/imgfmt/app/srt/SRTFile.java | 75 +- src/uk/me/parabola/imgfmt/app/srt/SRTHeader.java | 63 +- src/uk/me/parabola/imgfmt/app/srt/Sort.java | 575 +- 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/imgfmt/sys/Directory.java | 6 +- src/uk/me/parabola/log/Logger.java | 4 + src/uk/me/parabola/mkgmap/CommandArgsReader.java | 20 +- src/uk/me/parabola/mkgmap/build/MapArea.java | 63 +- src/uk/me/parabola/mkgmap/build/MapBuilder.java | 34 +- .../parabola/mkgmap/combiners/GmapsuppBuilder.java | 2 +- .../me/parabola/mkgmap/combiners/MdrBuilder.java | 39 +- .../mkgmap/filters/DouglasPeuckerFilter.java | 77 +- .../parabola/mkgmap/filters/LineMergeFilter.java | 16 +- .../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 | 41 +- .../me/parabola/mkgmap/general/MapCollector.java | 6 +- .../me/parabola/mkgmap/general/MapDataSource.java | 1 + src/uk/me/parabola/mkgmap/general/MapDetails.java | 28 +- 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/MapRoad.java | 3 +- src/uk/me/parabola/mkgmap/general/MapShape.java | 153 +- .../me/parabola/mkgmap/general/PolygonClipper.java | 23 +- src/uk/me/parabola/mkgmap/general/RoadNetwork.java | 285 - .../me/parabola/mkgmap/main/AbstractTestMap.java | 5 +- src/uk/me/parabola/mkgmap/main/Main.java | 52 +- src/uk/me/parabola/mkgmap/main/MapMaker.java | 10 +- src/uk/me/parabola/mkgmap/main/StyleTester.java | 35 +- src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java | 55 +- .../mkgmap/osmstyle/CombinedStyleFileLoader.java | 2 + .../me/parabola/mkgmap/osmstyle/ConvertedWay.java | 285 + .../mkgmap/osmstyle/DirectoryFileLoader.java | 17 +- .../parabola/mkgmap/osmstyle/ExpressionRule.java | 28 +- .../me/parabola/mkgmap/osmstyle/JarFileLoader.java | 12 +- src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java | 655 +- .../parabola/mkgmap/osmstyle/RuleFileReader.java | 45 +- src/uk/me/parabola/mkgmap/osmstyle/RuleIndex.java | 177 +- src/uk/me/parabola/mkgmap/osmstyle/RuleSet.java | 118 +- src/uk/me/parabola/mkgmap/osmstyle/StyleImpl.java | 2 +- .../parabola/mkgmap/osmstyle/StyledConverter.java | 1693 ++- src/uk/me/parabola/mkgmap/osmstyle/TypeReader.java | 49 +- .../parabola/mkgmap/osmstyle/WrongAngleFixer.java | 1403 +++ .../parabola/mkgmap/osmstyle/actions/Action.java | 8 +- .../mkgmap/osmstyle/actions/ActionReader.java | 13 +- .../mkgmap/osmstyle/actions/AddAccessAction.java | 17 +- .../mkgmap/osmstyle/actions/AddLabelAction.java | 12 +- .../mkgmap/osmstyle/actions/AddTagAction.java | 19 +- .../mkgmap/osmstyle/actions/DeleteAction.java | 12 +- .../osmstyle/actions/DeleteAllTagsAction.java | 3 +- .../mkgmap/osmstyle/actions/EchoAction.java | 3 +- .../mkgmap/osmstyle/actions/EchoTagsAction.java | 3 +- .../osmstyle/actions/HighwaySymbolFilter.java | 11 +- .../mkgmap/osmstyle/actions/NameAction.java | 15 +- .../mkgmap/osmstyle/actions/NotEqualFilter.java | 7 +- .../mkgmap/osmstyle/actions/RenameAction.java | 13 +- .../mkgmap/osmstyle/actions/SubAction.java | 3 +- .../osmstyle/actions/SubstitutionFilter.java | 14 +- .../mkgmap/osmstyle/actions/ValueBuilder.java | 73 +- .../mkgmap/osmstyle/actions/ValueItem.java | 7 +- .../parabola/mkgmap/osmstyle/eval/AbstractOp.java | 22 + src/uk/me/parabola/mkgmap/osmstyle/eval/AndOp.java | 18 + .../me/parabola/mkgmap/osmstyle/eval/LinkedOp.java | 40 +- src/uk/me/parabola/mkgmap/osmstyle/eval/Op.java | 9 + src/uk/me/parabola/mkgmap/osmstyle/eval/OrOp.java | 15 + .../mkgmap/osmstyle/function/AreaSizeFunction.java | 2 +- .../mkgmap/osmstyle/function/CachedFunction.java | 9 +- .../mkgmap/osmstyle/function/GetTagFunction.java | 6 +- .../mkgmap/osmstyle/function/IsClosedFunction.java | 3 +- .../osmstyle/housenumber/HousenumberGenerator.java | 81 +- .../osmstyle/housenumber/HousenumberMatch.java | 14 +- .../mkgmap/reader/MapperBasedMapDataSource.java | 2 +- src/uk/me/parabola/mkgmap/reader/dem/DEM.java | 20 +- .../mkgmap/reader/osm/CoastlineFileLoader.java | 2 +- src/uk/me/parabola/mkgmap/reader/osm/CoordPOI.java | 27 +- src/uk/me/parabola/mkgmap/reader/osm/Element.java | 116 +- .../parabola/mkgmap/reader/osm/ElementSaver.java | 26 +- .../mkgmap/reader/osm/FakeIdGenerator.java | 6 +- src/uk/me/parabola/mkgmap/reader/osm/GType.java | 57 +- .../parabola/mkgmap/reader/osm/HighwayHooks.java | 196 +- .../mkgmap/reader/osm/LinkDestinationHook.java | 71 +- .../parabola/mkgmap/reader/osm/LocationHook.java | 4 +- .../mkgmap/reader/osm/MultiPolygonRelation.java | 397 +- .../me/parabola/mkgmap/reader/osm/OsmHandler.java | 2 +- .../mkgmap/reader/osm/OsmMapDataSource.java | 2 +- .../mkgmap/reader/osm/POIGeneratorHook.java | 29 +- .../mkgmap/reader/osm/RelationStyleHook.java | 19 +- .../mkgmap/reader/osm/RestrictionRelation.java | 805 +- .../me/parabola/mkgmap/reader/osm/RoutingHook.java | 7 + src/uk/me/parabola/mkgmap/reader/osm/Rule.java | 14 + .../parabola/mkgmap/reader/osm/SeaGenerator.java | 150 +- .../mkgmap/reader/osm/SeaPolygonRelation.java | 1 + src/uk/me/parabola/mkgmap/reader/osm/TagDict.java | 96 + src/uk/me/parabola/mkgmap/reader/osm/Tags.java | 123 +- src/uk/me/parabola/mkgmap/reader/osm/Way.java | 77 +- .../reader/osm/boundary/BoundaryConverter.java | 4 +- .../mkgmap/reader/osm/boundary/BoundaryDiff.java | 5 +- .../reader/osm/boundary/BoundaryElement.java | 2 +- .../reader/osm/boundary/BoundaryElementSaver.java | 12 +- .../reader/osm/boundary/BoundaryFile2Gpx.java | 2 +- .../osm/boundary/BoundaryLocationPreparer.java | 8 +- .../reader/osm/boundary/BoundaryPreprocessor.java | 2 +- .../reader/osm/boundary/BoundaryQuadTree.java | 10 +- .../reader/osm/boundary/BoundaryRelation.java | 26 +- .../mkgmap/reader/osm/boundary/BoundarySaver.java | 51 +- .../mkgmap/reader/osm/boundary/BoundaryUtil.java | 57 +- .../reader/overview/OverviewMapDataSource.java | 11 +- .../mkgmap/reader/polish/PolishMapDataSource.java | 56 +- .../reader/polish/PolishTurnRestriction.java | 23 +- .../mkgmap/reader/polish/RestrictionHelper.java | 30 +- .../parabola/mkgmap/reader/polish/RoadHelper.java | 49 +- src/uk/me/parabola/mkgmap/scan/TokenScanner.java | 15 +- .../mkgmap/sea/optional/PrecompSeaGenerator.java | 14 +- .../mkgmap/sea/optional/PrecompSeaMerger.java | 26 +- .../mkgmap/sea/optional/PrecompSeaSaver.java | 28 +- src/uk/me/parabola/mkgmap/srt/SrtTextReader.java | 234 +- 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/MultiHashMap.java | 12 +- src/uk/me/parabola/util/MultiIdentityHashMap.java | 12 +- src/uk/me/parabola/util/QuadTree.java | 34 +- src/uk/me/parabola/util/QuadTreeNode.java | 5 +- test/func/SimpleTest.java | 20 +- test/func/StructureTest.java | 2 +- test/func/files/GmapsuppTest.java | 28 +- test/func/files/TdbTest.java | 4 +- test/func/lib/TestDataSource.java | 2 +- test/func/lib/TestUtils.java | 2 +- test/func/route/SimpleRouteTest.java | 55 +- test/func/sources/TestSourceTest.java | 4 +- test/main/NumberRangeTest.java | 1 - test/main/SortTest.java | 315 + test/resources/rules/quoted_var.test | 14 + test/uk/me/parabola/imgfmt/UtilsTest.java | 56 + test/uk/me/parabola/imgfmt/app/CoordTest.java | 74 + .../imgfmt/app/labelenc/Format6EncoderTest.java | 46 + .../parabola/imgfmt/app/labelenc/LabelEncTest.java | 43 + .../me/parabola/imgfmt/app/srt/SortExpandTest.java | 16 +- test/uk/me/parabola/imgfmt/app/srt/SortTest.java | 131 +- .../parabola/imgfmt/app/srt/SrtCollatorTest.java | 147 + .../imgfmt/app/srt/UnicodeCollatorTest.java | 47 + .../me/parabola/imgfmt/app/srt/UnicodeKeyTest.java | 72 + .../mkgmap/filters/ShapeMergeFilterTest.java | 385 + .../uk/me/parabola/mkgmap/general/MapLineTest.java | 51 + .../parabola/mkgmap/general/PointInShapeTest.java | 286 - .../mkgmap/osmstyle/RuleFileReaderTest.java | 112 +- .../me/parabola/mkgmap/osmstyle/StyleImplTest.java | 6 +- .../mkgmap/osmstyle/StyledConverterTest.java | 8 +- .../osmstyle/actions/AddAccessActionTest.java | 16 +- .../mkgmap/osmstyle/actions/ValueBuilderTest.java | 193 + .../me/parabola/mkgmap/reader/osm/ElementTest.java | 28 +- .../mkgmap/reader/osm/RestrictionRelationTest.java | 230 + .../me/parabola/mkgmap/scan/TokenScannerTest.java | 60 + .../me/parabola/mkgmap/srt/SrtTextReaderTest.java | 28 +- .../me/parabola/mkgmap/typ/TypTextReaderTest.java | 7 +- 277 files changed, 25671 insertions(+), 6217 deletions(-) create mode 100644 doc/styles/internal-tags.txt create mode 100644 extra/src/uk/me/parabola/util/CollationRules.java create mode 100644 resources/sort/README create mode 100644 resources/sort/cp0.txt create mode 100644 resources/sort/cp1253.txt create mode 100644 resources/sort/cp1254.txt create mode 100644 resources/sort/cp1255.txt create mode 100644 resources/sort/cp1257.txt create mode 100644 resources/sort/cp1258.txt create mode 100644 resources/sort/cp65001.txt create mode 100644 resources/styles/default/inc/access_country delete mode 100755 scripts/download/buildwatch delete mode 100755 scripts/download/mksnapindex create mode 100755 scripts/download/nightly create mode 100755 scripts/download/post-commit-svn-redis create mode 100755 scripts/download/pre-commit-crlf delete mode 100644 scripts/download/skel-bot delete mode 100644 scripts/download/skel-top delete mode 100644 src/uk/me/parabola/imgfmt/app/labelenc/Simple8Encoder.java create mode 100644 src/uk/me/parabola/imgfmt/app/net/AccessTagsAndBits.java create mode 100644 src/uk/me/parabola/imgfmt/app/net/GeneralRouteRestriction.java create mode 100644 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java create mode 100644 src/uk/me/parabola/mkgmap/filters/ShapeMergeFilter.java delete mode 100644 src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java delete mode 100644 src/uk/me/parabola/mkgmap/general/MapPointMultiMap.java delete mode 100644 src/uk/me/parabola/mkgmap/general/RoadNetwork.java create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/ConvertedWay.java create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/WrongAngleFixer.java create mode 100644 src/uk/me/parabola/mkgmap/reader/osm/TagDict.java create mode 100644 test/main/SortTest.java create mode 100644 test/resources/rules/quoted_var.test create mode 100644 test/uk/me/parabola/imgfmt/UtilsTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/CoordTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/labelenc/Format6EncoderTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/labelenc/LabelEncTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/srt/UnicodeCollatorTest.java create mode 100644 test/uk/me/parabola/imgfmt/app/srt/UnicodeKeyTest.java create mode 100644 test/uk/me/parabola/mkgmap/filters/ShapeMergeFilterTest.java create mode 100644 test/uk/me/parabola/mkgmap/general/MapLineTest.java delete mode 100644 test/uk/me/parabola/mkgmap/general/PointInShapeTest.java create mode 100644 test/uk/me/parabola/mkgmap/osmstyle/actions/ValueBuilderTest.java create mode 100644 test/uk/me/parabola/mkgmap/reader/osm/RestrictionRelationTest.java -- 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