[mkgmap] branch upstream updated (bb420e6 -> 4a57ee4)
Bas Couwenberg
sebastic at debian.org
Sat Jul 1 12:31:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository mkgmap.
from bb420e6 Imported Upstream version 0.0.0+svn3741
new 4a57ee4 New upstream version 0.0.0+svn3973
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/inspectionProfiles/Mapping.xml | 6 +-
.idea/inspectionProfiles/Project_Default.xml | 13 +-
.idea/inspectionProfiles/profiles_settings.xml | 2 +-
build.xml | 1 +
doc/options.txt | 141 +++-
doc/styles/internal-tags.txt | 4 +-
doc/styles/rules-filters.txt | 7 +-
doc/styles/rules.txt | 76 +-
resources/help/en/options | 133 ++-
resources/mkgmap-version.properties | 4 +-
resources/roadNameConfig.txt | 88 ++
resources/sort/cp1252.txt | 14 +-
resources/sort/cp1254.txt | 8 +-
resources/sort/cp1258.txt | 4 +-
resources/styles/default/inc/name | 1 +
resources/styles/default/lines | 82 +-
resources/styles/default/polygons | 7 +-
resources/styles/empty/info | 8 +
resources/styles/{contours_ft => empty}/version | 0
src/uk/me/parabola/imgfmt/FileSystemParam.java | 9 +
src/uk/me/parabola/imgfmt/Utils.java | 48 +-
src/uk/me/parabola/imgfmt/app/Area.java | 30 +-
src/uk/me/parabola/imgfmt/app/Coord.java | 276 +++---
src/uk/me/parabola/imgfmt/app/Label.java | 27 +-
.../imgfmt/app/labelenc/AnyCharsetEncoder.java | 5 +-
.../parabola/imgfmt/app/labelenc/EncodedText.java | 1 +
src/uk/me/parabola/imgfmt/app/lbl/LBLFile.java | 7 +-
src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java | 10 +-
src/uk/me/parabola/imgfmt/app/map/MapReader.java | 4 +-
.../parabola/imgfmt/app/mdr/LargeListSorter.java | 125 +++
src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java | 74 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr10.java | 16 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr11.java | 51 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr19.java | 2 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java | 82 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr21.java | 51 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr22.java | 74 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr28.java | 3 -
src/uk/me/parabola/imgfmt/app/mdr/Mdr29.java | 6 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr2x.java | 65 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java | 93 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr5Record.java | 26 +
src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java | 333 +++++---
src/uk/me/parabola/imgfmt/app/mdr/Mdr7Record.java | 95 ++-
src/uk/me/parabola/imgfmt/app/mdr/Mdr8.java | 10 +-
src/uk/me/parabola/imgfmt/app/mdr/Mdr8Record.java | 6 +-
src/uk/me/parabola/imgfmt/app/mdr/MdrConfig.java | 131 +++
src/uk/me/parabola/imgfmt/app/mdr/MdrUtils.java | 30 +-
src/uk/me/parabola/imgfmt/app/mdr/PrefixIndex.java | 60 +-
.../parabola/imgfmt/app/net/AccessTagsAndBits.java | 73 +-
.../me/parabola/imgfmt/app/net/AngleChecker.java | 15 +-
src/uk/me/parabola/imgfmt/app/net/NETFile.java | 27 +-
.../me/parabola/imgfmt/app/net/NETFileReader.java | 13 +-
src/uk/me/parabola/imgfmt/app/net/RouteNode.java | 192 +++--
.../me/parabola/imgfmt/app/srt/CodePosition.java | 2 +-
.../srt/{MultiSortKey.java => DoubleSortKey.java} | 16 +-
src/uk/me/parabola/imgfmt/app/srt/SRTFile.java | 36 +-
src/uk/me/parabola/imgfmt/app/srt/SRTHeader.java | 46 +-
src/uk/me/parabola/imgfmt/app/srt/Sort.java | 299 +++++--
.../me/parabola/imgfmt/app/srt/SrtFileReader.java | 291 +++++++
src/uk/me/parabola/imgfmt/app/srt/SrtSortKey.java | 19 +-
.../me/parabola/imgfmt/app/trergn/MapObject.java | 15 +-
src/uk/me/parabola/imgfmt/app/trergn/Polyline.java | 12 +-
.../parabola/imgfmt/app/trergn/RGNFileReader.java | 22 +-
.../me/parabola/imgfmt/app/trergn/Subdivision.java | 33 +-
.../parabola/imgfmt/app/trergn/TREFileReader.java | 11 +-
.../me/parabola/imgfmt/app/trergn/TREHeader.java | 11 +-
src/uk/me/parabola/imgfmt/mdxfmt/MdxFile.java | 10 +-
src/uk/me/parabola/imgfmt/sys/ImgHeader.java | 14 +-
src/uk/me/parabola/log/UsefulFormatter.java | 6 +-
.../me/parabola/mkgmap/build/LayerFilterChain.java | 13 +-
src/uk/me/parabola/mkgmap/build/Locator.java | 23 +-
src/uk/me/parabola/mkgmap/build/LocatorConfig.java | 17 +-
src/uk/me/parabola/mkgmap/build/LocatorUtil.java | 9 +-
src/uk/me/parabola/mkgmap/build/MapArea.java | 585 ++++++++-----
src/uk/me/parabola/mkgmap/build/MapBuilder.java | 84 +-
src/uk/me/parabola/mkgmap/build/MapSplitter.java | 111 +--
.../me/parabola/mkgmap/combiners/GmapiBuilder.java | 10 +-
.../parabola/mkgmap/combiners/GmapsuppBuilder.java | 29 +-
.../me/parabola/mkgmap/combiners/MdrBuilder.java | 8 +-
.../parabola/mkgmap/combiners/OverviewBuilder.java | 32 +-
.../mkgmap/filters/LinePreparerFilter.java | 3 +
.../mkgmap/filters/LineSplitterFilter.java | 81 +-
.../MustSplitException.java} | 28 +-
.../mkgmap/filters/PolygonSplitterBase.java | 85 +-
.../mkgmap/filters/PolygonSplitterFilter.java | 57 +-
.../mkgmap/filters/PredictFilterPoints.java | 73 ++
.../parabola/mkgmap/filters/ShapeMergeFilter.java | 354 +++++---
src/uk/me/parabola/mkgmap/general/AreaClipper.java | 20 +-
.../mkgmap/general/LoadableMapDataSource.java | 3 +-
src/uk/me/parabola/mkgmap/general/MapDetails.java | 41 +-
src/uk/me/parabola/mkgmap/general/MapLine.java | 7 +-
.../me/parabola/mkgmap/general/PolygonClipper.java | 82 --
src/uk/me/parabola/mkgmap/main/Main.java | 13 +-
src/uk/me/parabola/mkgmap/main/MapMaker.java | 4 +-
src/uk/me/parabola/mkgmap/main/StyleTester.java | 124 +--
src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java | 2 +-
.../parabola/mkgmap/osmstyle/ExpressionRule.java | 2 +-
src/uk/me/parabola/mkgmap/osmstyle/NameFinder.java | 116 +++
.../mkgmap/osmstyle/PrefixSuffixFilter.java | 324 +++++++
src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java | 35 +-
.../parabola/mkgmap/osmstyle/RuleFileReader.java | 314 +++++--
src/uk/me/parabola/mkgmap/osmstyle/RuleIndex.java | 109 ++-
src/uk/me/parabola/mkgmap/osmstyle/StyleImpl.java | 9 -
.../me/parabola/mkgmap/osmstyle/StylePrinter.java | 2 +-
.../parabola/mkgmap/osmstyle/StyledConverter.java | 97 ++-
.../mkgmap/osmstyle/actions/ActionList.java | 13 +
.../mkgmap/osmstyle/actions/EchoAction.java | 5 +-
.../mkgmap/osmstyle/actions/EchoTagsAction.java | 5 +-
.../mkgmap/osmstyle/actions/HeightFilter.java | 9 +-
.../parabola/mkgmap/osmstyle/eval/AbstractOp.java | 29 +
.../me/parabola/mkgmap/osmstyle/eval/EqualsOp.java | 8 -
.../mkgmap/osmstyle/eval/ExpressionReader.java | 61 +-
.../me/parabola/mkgmap/osmstyle/eval/LinkedOp.java | 7 +
src/uk/me/parabola/mkgmap/osmstyle/eval/Op.java | 7 +
.../mkgmap/osmstyle/housenumber/ExtNumbers.java | 162 ++--
.../osmstyle/housenumber/HousenumberGenerator.java | 5 +-
src/uk/me/parabola/mkgmap/reader/MapReader.java | 67 ++
.../mkgmap/reader/MapperBasedMapDataSource.java | 24 +-
src/uk/me/parabola/mkgmap/reader/dem/Brent.java | 99 ---
src/uk/me/parabola/mkgmap/reader/dem/DEM.java | 863 -------------------
src/uk/me/parabola/mkgmap/reader/dem/HGTDEM.java | 68 --
.../mkgmap/reader/dem/optional/GeoTiffDEM.java | 156 ----
.../mkgmap/reader/osm/CoastlineFileLoader.java | 52 +-
src/uk/me/parabola/mkgmap/reader/osm/Element.java | 32 +-
.../parabola/mkgmap/reader/osm/ElementSaver.java | 46 +-
.../parabola/mkgmap/reader/osm/HighwayHooks.java | 36 +-
.../mkgmap/reader/osm/LinkDestinationHook.java | 33 +-
.../mkgmap/reader/osm/LoadableOsmDataSource.java | 36 -
.../parabola/mkgmap/reader/osm/LocationHook.java | 23 +-
.../mkgmap/reader/osm/MultiPolygonCutter.java | 753 +++++++++++++++++
.../mkgmap/reader/osm/MultiPolygonRelation.java | 934 +++------------------
src/uk/me/parabola/mkgmap/reader/osm/Node.java | 1 +
...oastDataSource.java => OsmCoastDataSource.java} | 11 +-
.../me/parabola/mkgmap/reader/osm/OsmHandler.java | 93 +-
.../mkgmap/reader/osm/OsmMapDataSource.java | 105 ++-
...ataSource.java => OsmPrecompSeaDataSource.java} | 19 +-
.../mkgmap/reader/osm/POIGeneratorHook.java | 34 +-
.../mkgmap/reader/osm/PrecompSeaElementSaver.java | 30 -
src/uk/me/parabola/mkgmap/reader/osm/Relation.java | 5 +
.../mkgmap/reader/osm/RelationStyleHook.java | 19 +-
.../mkgmap/reader/osm/ResidentialHook.java | 137 +++
.../mkgmap/reader/osm/RestrictionRelation.java | 43 +-
.../parabola/mkgmap/reader/osm/SeaGenerator.java | 57 +-
.../mkgmap/reader/osm/SeaPolygonRelation.java | 2 +-
src/uk/me/parabola/mkgmap/reader/osm/TagDict.java | 17 +
src/uk/me/parabola/mkgmap/reader/osm/Tags.java | 151 +---
src/uk/me/parabola/mkgmap/reader/osm/Way.java | 1 +
.../reader/osm/bin/OsmBinCoastDataSource.java | 41 -
.../mkgmap/reader/osm/bin/OsmBinHandler.java | 46 +-
.../mkgmap/reader/osm/bin/OsmBinMapDataSource.java | 71 --
.../reader/osm/bin/OsmBinPrecompSeaDataSource.java | 42 -
.../mkgmap/reader/osm/boundary/Boundary.java | 9 +-
.../reader/osm/boundary/BoundaryConverter.java | 8 +-
.../reader/osm/boundary/BoundaryElementSaver.java | 148 +---
.../reader/osm/boundary/BoundaryLocationInfo.java | 12 +-
.../osm/boundary/BoundaryLocationPreparer.java | 133 ++-
.../reader/osm/boundary/BoundaryPreprocessor.java | 59 +-
.../reader/osm/boundary/BoundaryQuadTree.java | 28 +-
.../reader/osm/boundary/BoundaryRelation.java | 230 +----
.../mkgmap/reader/osm/boundary/BoundaryUtil.java | 12 +-
.../osm/boundary/LoadableBoundaryDataSource.java | 20 -
.../osm/boundary/O5mBinBoundaryDataSource.java | 59 --
.../osm/boundary/OsmBinBoundaryDataSource.java | 59 --
...yDataSource.java => OsmBoundaryDataSource.java} | 10 +-
.../mkgmap/reader/osm/o5m/O5mBinHandler.java | 23 +-
.../mkgmap/reader/osm/o5m/O5mBinMapDataSource.java | 57 --
.../mkgmap/reader/osm/xml/Osm5MapDataSource.java | 84 --
.../{Osm5XmlHandler.java => OsmXmlHandler.java} | 86 +-
.../reader/overview/OverviewMapDataSource.java | 3 +-
.../parabola/mkgmap/reader/plugin/MapReader.java | 90 --
.../mkgmap/reader/polish/PolishMapDataSource.java | 13 +-
.../mkgmap/reader/test/ElementTestDataSource.java | 4 +-
.../mkgmap/sea/optional/PrecompSeaGenerator.java | 4 +-
src/uk/me/parabola/mkgmap/srt/SrtTextReader.java | 102 ++-
src/uk/me/parabola/util/Java2DConverter.java | 60 +-
src/uk/me/parabola/util/ShapeSplitter.java | 441 +++++++++-
test/func/read/ImgReadTest.java | 4 +-
test/func/route/SimpleRouteTest.java | 2 +-
test/func/style/ScriptedStyleTest.java | 19 +-
test/resources/rules/if-then-1.test | 20 +
test/resources/rules/if-then-2.test | 19 +
test/resources/rules/if-then-else-1.test | 27 +
test/resources/rules/two-types1.test | 20 +
test/uk/me/parabola/imgfmt/UtilsTest.java | 21 +-
test/uk/me/parabola/imgfmt/app/CoordTest.java | 98 ++-
.../me/parabola/imgfmt/app/srt/SortExpandTest.java | 8 -
test/uk/me/parabola/imgfmt/app/srt/SortTest.java | 5 +-
.../mkgmap/filters/LineSplitterFilterTest.java | 105 +++
.../mkgmap/filters/ShapeMergeFilterTest.java | 153 +++-
.../uk/me/parabola/mkgmap/general/MapLineTest.java | 16 +-
.../uk/me/parabola/mkgmap/reader/osm/TagsTest.java | 29 +-
test/uk/me/parabola/util/Java2DConverterTest.java | 51 +-
test/uk/me/parabola/util/ShapeSplitterTest.java | 399 +++++++++
194 files changed, 7797 insertions(+), 5829 deletions(-)
create mode 100644 resources/roadNameConfig.txt
create mode 100644 resources/styles/empty/info
copy resources/styles/{contours_ft => empty}/version (100%)
create mode 100644 src/uk/me/parabola/imgfmt/app/mdr/LargeListSorter.java
copy src/uk/me/parabola/imgfmt/app/srt/{MultiSortKey.java => DoubleSortKey.java} (68%)
create mode 100644 src/uk/me/parabola/imgfmt/app/srt/SrtFileReader.java
copy src/uk/me/parabola/mkgmap/{osmstyle/actions/Action.java => filters/MustSplitException.java} (51%)
create mode 100644 src/uk/me/parabola/mkgmap/filters/PredictFilterPoints.java
delete mode 100644 src/uk/me/parabola/mkgmap/general/PolygonClipper.java
create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/NameFinder.java
create mode 100644 src/uk/me/parabola/mkgmap/osmstyle/PrefixSuffixFilter.java
create mode 100644 src/uk/me/parabola/mkgmap/reader/MapReader.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/dem/Brent.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/dem/DEM.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/dem/HGTDEM.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/dem/optional/GeoTiffDEM.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/LoadableOsmDataSource.java
create mode 100644 src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonCutter.java
rename src/uk/me/parabola/mkgmap/reader/osm/{xml/Osm5CoastDataSource.java => OsmCoastDataSource.java} (73%)
rename src/uk/me/parabola/mkgmap/reader/osm/{xml/Osm5PrecompSeaDataSource.java => OsmPrecompSeaDataSource.java} (64%)
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/PrecompSeaElementSaver.java
create mode 100644 src/uk/me/parabola/mkgmap/reader/osm/ResidentialHook.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/bin/OsmBinCoastDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/bin/OsmBinMapDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/bin/OsmBinPrecompSeaDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/boundary/LoadableBoundaryDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/boundary/O5mBinBoundaryDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/boundary/OsmBinBoundaryDataSource.java
rename src/uk/me/parabola/mkgmap/reader/osm/boundary/{Osm5BoundaryDataSource.java => OsmBoundaryDataSource.java} (83%)
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/o5m/O5mBinMapDataSource.java
delete mode 100644 src/uk/me/parabola/mkgmap/reader/osm/xml/Osm5MapDataSource.java
rename src/uk/me/parabola/mkgmap/reader/osm/xml/{Osm5XmlHandler.java => OsmXmlHandler.java} (82%)
delete mode 100644 src/uk/me/parabola/mkgmap/reader/plugin/MapReader.java
create mode 100644 test/resources/rules/if-then-1.test
create mode 100644 test/resources/rules/if-then-2.test
create mode 100644 test/resources/rules/if-then-else-1.test
create mode 100644 test/resources/rules/two-types1.test
create mode 100644 test/uk/me/parabola/mkgmap/filters/LineSplitterFilterTest.java
create mode 100644 test/uk/me/parabola/util/ShapeSplitterTest.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git
More information about the Pkg-grass-devel
mailing list