This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch upstream in repository mkgmap.
from 2082d6a Imported Upstream version 0.0.0+svn3333 new 31ade85 Imported Upstream version 0.0.0+svn3366 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: .classpath | 10 +- .idea/codeStyleSettings.xml | 4 +- .idea/inspectionProfiles/Mapping.xml | 71 +++++- .project | 28 ++- .settings/org.apache.ivyde.eclipse.prefs | 2 + .settings/org.eclipse.jdt.core.prefs | 100 ++++++++ doc/options.txt | 19 +- doc/styles/rules-filters.txt | 32 ++- doc/styles/rules.txt | 10 +- ivy.xml | 3 + ivysettings.xml | 2 +- resources/LocatorConfig.xml | 148 ++++++------ resources/help/en/options | 19 +- resources/mkgmap-version.properties | 4 +- resources/styles/default/inc/address | 22 +- resources/styles/default/inc/water_lines | 1 + resources/styles/default/points | 14 +- .../parabola/imgfmt/app/BufferedImgFileReader.java | 11 +- src/uk/me/parabola/imgfmt/app/Coord.java | 27 ++- .../me/parabola/imgfmt/app/lbl/LBLFileReader.java | 15 +- src/uk/me/parabola/imgfmt/app/lbl/POIRecord.java | 39 +-- src/uk/me/parabola/imgfmt/app/net/NODFile.java | 4 + src/uk/me/parabola/imgfmt/app/net/NODHeader.java | 17 +- src/uk/me/parabola/imgfmt/app/net/RoadDef.java | 19 +- .../me/parabola/imgfmt/app/trergn/Subdivision.java | 22 +- src/uk/me/parabola/imgfmt/app/trergn/TREFile.java | 4 + .../parabola/imgfmt/app/trergn/TREFileReader.java | 6 +- .../me/parabola/imgfmt/app/trergn/TREHeader.java | 10 +- src/uk/me/parabola/mkgmap/CommandArgsReader.java | 17 +- src/uk/me/parabola/mkgmap/build/LocatorConfig.java | 23 +- src/uk/me/parabola/mkgmap/build/MapArea.java | 98 +++++--- src/uk/me/parabola/mkgmap/build/MapBuilder.java | 40 +-- src/uk/me/parabola/mkgmap/build/MapSplitter.java | 29 ++- .../parabola/mkgmap/combiners/GmapsuppBuilder.java | 11 +- src/uk/me/parabola/mkgmap/main/StyleTester.java | 9 + src/uk/me/parabola/mkgmap/osmstyle/ActionRule.java | 14 +- .../parabola/mkgmap/osmstyle/ExpressionRule.java | 16 +- .../parabola/mkgmap/osmstyle/RuleFileReader.java | 2 +- src/uk/me/parabola/mkgmap/osmstyle/RuleSet.java | 14 ++ src/uk/me/parabola/mkgmap/osmstyle/StyleImpl.java | 8 + .../parabola/mkgmap/osmstyle/StyledConverter.java | 158 +++++++++--- src/uk/me/parabola/mkgmap/osmstyle/TypeReader.java | 4 +- .../parabola/mkgmap/osmstyle/WrongAngleFixer.java | 2 +- .../mkgmap/osmstyle/actions/AddLabelAction.java | 2 +- .../mkgmap/osmstyle/actions/ConvertFilter.java | 44 +++- .../{EchoTagsAction.java => CountryISOFilter.java} | 33 ++- .../mkgmap/osmstyle/actions/HeightFilter.java | 2 +- .../mkgmap/osmstyle/actions/NameAction.java | 2 +- .../mkgmap/osmstyle/actions/SubstringFilter.java | 2 +- .../mkgmap/osmstyle/actions/ValueBuilder.java | 8 +- .../mkgmap/osmstyle/eval/UnitConversions.java | 168 +++++++++++-- .../osmstyle/housenumber/HousenumberGenerator.java | 146 ++++++++++- .../mkgmap/reader/MapperBasedMapDataSource.java | 13 + .../mkgmap/reader/osm/CoastlineFileLoader.java | 2 - src/uk/me/parabola/mkgmap/reader/osm/Element.java | 2 +- src/uk/me/parabola/mkgmap/reader/osm/GType.java | 23 +- .../mkgmap/reader/osm/MultiPolygonRelation.java | 11 + .../parabola/mkgmap/reader/osm/OsmConverter.java | 5 + .../mkgmap/reader/osm/OsmMapDataSource.java | 15 +- .../mkgmap/reader/osm/RelationStyleHook.java | 7 +- src/uk/me/parabola/mkgmap/reader/osm/Rule.java | 1 + .../parabola/mkgmap/reader/osm/SeaGenerator.java | 3 - src/uk/me/parabola/mkgmap/reader/osm/Style.java | 5 + src/uk/me/parabola/mkgmap/reader/osm/TagDict.java | 15 +- .../reader/osm/boundary/BoundaryConverter.java | 5 + .../mkgmap/reader/osm/boundary/BoundaryDiff.java | 24 +- .../reader/osm/boundary/BoundaryPreprocessor.java | 16 +- .../reader/osm/boundary/BoundaryQuadTree.java | 269 ++++++++++++--------- .../mkgmap/reader/osm/boundary/BoundarySaver.java | 164 +++++-------- .../mkgmap/reader/osm/boundary/BoundaryUtil.java | 252 ++++++++++++------- .../mkgmap/reader/polish/PolishMapDataSource.java | 7 + src/uk/me/parabola/util/Java2DConverter.java | 39 ++- src/uk/me/parabola/util/ShapeSplitter.java | 260 ++++++++++++++++++++ test/func/route/SimpleRouteTest.java | 2 +- test/uk/me/parabola/imgfmt/app/CoordTest.java | 15 ++ .../mkgmap/osmstyle/actions/ConvertFilterTest.java | 151 ++++++++++++ .../osmstyle/actions/CountryISOFilterTest.java | 55 +++++ .../mkgmap/osmstyle/actions/ValueBuilderTest.java | 14 ++ 78 files changed, 2122 insertions(+), 768 deletions(-) create mode 100644 .settings/org.apache.ivyde.eclipse.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs copy src/uk/me/parabola/mkgmap/osmstyle/actions/{EchoTagsAction.java => CountryISOFilter.java} (53%) create mode 100644 src/uk/me/parabola/util/ShapeSplitter.java create mode 100644 test/uk/me/parabola/mkgmap/osmstyle/actions/ConvertFilterTest.java create mode 100644 test/uk/me/parabola/mkgmap/osmstyle/actions/CountryISOFilterTest.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