logo separator

Build mkgmap/mkgmap #542.2

Commit: 4185 by gerd
Branch: trunk
Time: 6 May 2018, 6:51 a.m.
Passed
This test: 1 min 47 sec
Total time: 4 min 31 sec

tags5.patch: Improve the RuleIndex. Attached patch reduces again the number of evaluated rules, but should still evaluates all necessary rules. The old index still returned too many rules. Let's look at the example that I added as unit test. Set of rules: 0: a=* {set b=1} 1: b=1 {set c=1} 2: d=2 {set c=2} 3: c=* {set a=2} 4: c=1 {set d=2} 5: c=2 {set d=1} 6: d=1 [0x10401 resolution 24] 7: d=2 [0x10402 resolution 24] Assume we have no index and an element with only one tag a=1. We check each rule: Rules 0 matches and sets b=1 Now 1 matches and sets c=1 Rule 2 doesn't match. Rule 3 matches and sets a=2 Rule 4 matches and sets d=2 Rule 5 doesn't match. Rule 6 doesn't match. Rule 7 matches. The index is used to reduce the number of evaluated rules. In the best case it should return rules 0,1,3,4, and 7 for the given element. But the current code returns all rules because it thinks that rule 4 can set d=2 and therefore rule 2 might be triggered (which is wrong). The patch changes the index to recognizes the order of the rules which change tags and therefore returns only the needed rules.

Start build of mkgmap/mkgmap-4185 for BuildEnv: java=openjdk8, python=default {}

Checkout mkgmap/mkgmap branch trunk revision 4185

Starting script "build"

$ java -version

Picked up _JAVA_OPTIONS: -Duser.home=/home/builder/build/root_TVJLrM

openjdk version "1.8.0_161"

OpenJDK Runtime Environment (build 1.8.0_161-b14)

OpenJDK 64-Bit Server VM (build 25.161-b14, mixed mode)

$ ant -version

Picked up _JAVA_OPTIONS: -Duser.home=/home/builder/build/root_TVJLrM

Apache Ant(TM) version 1.9.6 compiled on June 29 2015

$ echo "svn.version: 4185" > resources/mkgmap-version.properties

$ echo "build.timestamp: $(date -Iseconds)" >> resources/mkgmap-version.properties

$ exit

exit

cd . for archives

tar . to /home/builder/build/root_TVJLrM/dist/mkgmap-r4185-src.tar.gz

cd . for archives

zip . to /home/builder/build/root_TVJLrM/dist/mkgmap-r4185-src.zip

$ ant -Dhave.version=1 dist

Picked up _JAVA_OPTIONS: -Duser.home=/home/builder/build/root_TVJLrM

Buildfile: /home/builder/build/root_TVJLrM/src/build.xml

prepare:

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/build/classes

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/lib/optional

ivy-availability:

download-ivy:

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/lib/build

[get] Getting: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.2.0/ivy-2.2.0.jar

[get] To: /home/builder/build/root_TVJLrM/src/lib/build/ivy-2.2.0.jar

init-ivy:

[ivy:configure] :: Ivy 2.2.0 - 20100923230623 :: http://ant.apache.org/ivy/ ::

[ivy:configure] :: loading settings :: file = /home/builder/build/root_TVJLrM/src/ivysettings.xml

resolve-compile:

[ivy:retrieve] downloading http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar ...

[ivy:retrieve] ........................................... (520kB)

[ivy:retrieve] .. (0kB)

[ivy:retrieve] [SUCCESSFUL ] com.google.protobuf#protobuf-java;2.5.0!protobuf-java.jar(bundle) (125ms)

[ivy:retrieve] downloading http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar ...

[ivy:retrieve] .... (129kB)

[ivy:retrieve] .. (0kB)

[ivy:retrieve] [SUCCESSFUL ] crosby#osmpbf;1.3.3!osmpbf.jar (37ms)

[ivy:retrieve] downloading http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar ...

[ivy:retrieve] ......... (464kB)

[ivy:retrieve] .. (0kB)

[ivy:retrieve] [SUCCESSFUL ] it.unimi.dsi#fastutil;6.5.15-mkg.1b!fastutil.jar (58ms)

compile:

[javac] Compiling 504 source files to /home/builder/build/root_TVJLrM/src/build/classes

build:

[copy] Copying 455 files to /home/builder/build/root_TVJLrM/src/build/classes

svn-version:

git-version:

check-version:

version-file:

dist:

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/dist

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/dist/lib

[copy] Copying 3 files to /home/builder/build/root_TVJLrM/src/dist/lib

[jar] Building jar: /home/builder/build/root_TVJLrM/src/dist/mkgmap.jar

[copy] Copying 2 files to /home/builder/build/root_TVJLrM/src/dist/doc

[copy] Copying 2 files to /home/builder/build/root_TVJLrM/src/dist

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/dist/examples

[copy] Copying 31 files to /home/builder/build/root_TVJLrM/src/dist/examples

BUILD SUCCESSFUL

Total time: 31 seconds

$ exit

exit

$ ant -Dhave.version=1 test

Picked up _JAVA_OPTIONS: -Duser.home=/home/builder/build/root_TVJLrM

Buildfile: /home/builder/build/root_TVJLrM/src/build.xml

prepare:

ivy-availability:

download-ivy:

init-ivy:

[ivy:configure] :: Ivy 2.2.0 - 20100923230623 :: http://ant.apache.org/ivy/ ::

[ivy:configure] :: loading settings :: file = /home/builder/build/root_TVJLrM/src/ivysettings.xml

resolve-compile:

compile:

build:

resolve-test:

[ivy:retrieve] downloading http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar ...

[ivy:retrieve] ........................................................ (239kB)

[ivy:retrieve] .. (0kB)

[ivy:retrieve] [SUCCESSFUL ] junit#junit;4.11!junit.jar (116ms)

[ivy:retrieve] downloading http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ...

[ivy:retrieve] ........... (43kB)

[ivy:retrieve] .. (0kB)

[ivy:retrieve] [SUCCESSFUL ] org.hamcrest#hamcrest-core;1.3!hamcrest-core.jar (48ms)

build-test:

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/build/test

[javac] Compiling 77 source files to /home/builder/build/root_TVJLrM/src/build/test

obtain-test-input-files:

[copy] Warning: /opt/data/testinput does not exist.

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/test/resources/in/img

[get] Getting: http://www.mkgmap.org.uk/testinput/osm/lon1.osm.gz

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/osm/lon1.osm.gz

[get] Getting: http://www.mkgmap.org.uk/testinput/osm/uk-test-1.osm.gz

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/osm/uk-test-1.osm.gz

[get] Getting: http://www.mkgmap.org.uk/testinput/osm/uk-test-2.osm.gz

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/osm/uk-test-2.osm.gz

[get] Getting: http://www.mkgmap.org.uk/testinput/mp/test1.mp

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/mp/test1.mp

[get] Getting: http://www.mkgmap.org.uk/testinput/img/63240001.img

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/img/63240001.img

[get] Getting: http://www.mkgmap.org.uk/testinput/img/63240002.img

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/img/63240002.img

[get] Getting: http://www.mkgmap.org.uk/testinput/img/63240003.img

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/img/63240003.img

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/N00W090.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/N00W090.hgt.zip

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/N00W091.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/N00W091.hgt.zip

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/S01W090.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/S01W090.hgt.zip

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/S01W091.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/S01W091.hgt.zip

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/S02W090.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/S02W090.hgt.zip

[get] Getting: http://www.mkgmap.org.uk/testinput/hgt/S02W091.hgt.zip

[get] To: /home/builder/build/root_TVJLrM/src/test/resources/in/hgt/S02W091.hgt.zip

test:

[mkdir] Created dir: /home/builder/build/root_TVJLrM/src/tmp/report

[junit] Picked up _JAVA_OPTIONS: -Duser.home=/home/builder/build/root_TVJLrM

[junit] Running func.ArgsTest

[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.953 sec

[junit] Running func.SimpleTest

[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.367 sec

[junit] Running func.StructureTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.679 sec

[junit] Running func.files.GmapsuppTest

[junit] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.722 sec

[junit] Running func.files.IndexTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.239 sec

[junit] Running func.files.TdbTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.091 sec

[junit] Running func.read.ImgReadTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 sec

[junit] Running func.route.SimpleRouteTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.832 sec

[junit] Running func.sources.TestSourceTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.695 sec

[junit] Running func.style.ScriptedStyleTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.529 sec

[junit] Running uk.me.parabola.imgfmt.UtilsTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec

[junit] Running uk.me.parabola.imgfmt.app.BitReaderTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

[junit] Running uk.me.parabola.imgfmt.app.CoordTest

[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec

[junit] Running uk.me.parabola.imgfmt.app.dem.DemTileTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec

[junit] Running uk.me.parabola.imgfmt.app.labelenc.CodeFunctionsTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec

[junit] Running uk.me.parabola.imgfmt.app.labelenc.Format6EncoderTest

[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec

[junit] Running uk.me.parabola.imgfmt.app.labelenc.LabelEncTest

[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

[junit] Running uk.me.parabola.imgfmt.app.labelenc.TableTransliteratorTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.038 sec

[junit] Running uk.me.parabola.imgfmt.app.net.NumberPreparerTest

[junit] Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.082 sec

[junit] Running uk.me.parabola.imgfmt.app.net.NumbersTest

[junit] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec

[junit] Running uk.me.parabola.imgfmt.app.net.RoadDefTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec

[junit] Running uk.me.parabola.imgfmt.app.net.VarBitWriterTest

[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.CombinedSortKeyTest

[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.SortExpandTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.SortTest

[junit] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.SrtCollatorTest

[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.147 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.UnicodeCollatorTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.076 sec

[junit] Running uk.me.parabola.imgfmt.app.srt.UnicodeKeyTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.134 sec

[junit] Running uk.me.parabola.imgfmt.app.typ.ColourInfoTest

[junit] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 sec

[junit] Running uk.me.parabola.imgfmt.app.typ.TYPFileTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

[junit] Running uk.me.parabola.mkgmap.CommandArgsTest

[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec

[junit] Running uk.me.parabola.mkgmap.OptionTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec

[junit] Running uk.me.parabola.mkgmap.OptionsTest

[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

[junit] Running uk.me.parabola.mkgmap.filters.LineSplitterFilterTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.301 sec

[junit] Running uk.me.parabola.mkgmap.filters.ShapeMergeFilterTest

[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.368 sec

[junit] Running uk.me.parabola.mkgmap.general.LineClipperTest

[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec

[junit] Running uk.me.parabola.mkgmap.general.MapLineTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.ActionReaderTest

[junit] Tests run: 19, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.ExpressionArrangerTest

[junit] Tests run: 19, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.RuleFileReaderTest

[junit] Tests run: 60, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.228 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.RuleSetTest

[junit] Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.StyleImplTest

[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.022 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.StyledConverterTest

[junit] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.267 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.TypeReaderTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.AddAccessActionTest

[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.AddTagActionTest

[junit] Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.ConvertFilterTest

[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.017 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.CountryISOFilterTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.HighwaySymbolFilterTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.NotContainedFilterTest

[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.PartFilterTest

[junit] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.SubstringFilterTest

[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.actions.ValueBuilderTest

[junit] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 sec

[junit] Running uk.me.parabola.mkgmap.osmstyle.eval.ValueWithUnitTest

[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec

[junit] Running uk.me.parabola.mkgmap.reader.hgt.HGTConverterTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.272 sec

[junit] Running uk.me.parabola.mkgmap.reader.osm.CustomCollectionsTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 sec

[junit] Running uk.me.parabola.mkgmap.reader.osm.ElementTest

[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec

[junit] Running uk.me.parabola.mkgmap.reader.osm.RestrictionRelationTest

[junit] Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.037 sec

[junit] Running uk.me.parabola.mkgmap.reader.osm.TagsTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec

[junit] Running uk.me.parabola.mkgmap.scan.TokenScannerTest

[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec

[junit] Running uk.me.parabola.mkgmap.srt.SrtTextReaderTest

[junit] Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec

[junit] Running uk.me.parabola.mkgmap.typ.TypTextReaderTest

[junit] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec

[junit] Running uk.me.parabola.util.Java2DConverterTest

[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec

[junit] Running uk.me.parabola.util.KdTreeTest

[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.24 sec

[junit] Running uk.me.parabola.util.ShapeSplitterTest

[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec

[junitreport] Processing /home/builder/build/root_TVJLrM/src/tmp/TESTS-TestSuites.xml to /tmp/null619163188

[junitreport] Loading stylesheet jar:file:/opt/jars/apache-ant-1.9.6/lib/ant-junit.jar!/org/apache/tools/ant/taskdefs/optional/junit/xsl/junit-frames.xsl

[junitreport] Transform time: 3027ms

[junitreport] Deleting: /tmp/null619163188

BUILD SUCCESSFUL

Total time: 59 seconds

$ exit

exit

Script ended without errors.

End build of mkgmap/mkgmap-4185 for environment BuildEnv: java=openjdk8, python=default {}

Latest commits

  • splitter-r654 - add note that splitter doesn't handle holes in *.poly files.
    05 apr 2024
  • mkgmap-r4919 Avoid possible integer overflow in blocksize calculation when gmapsupp contains large number of tiles.
    04 apr 2024
  • mkgmap-r4918 add surface=chipseal to group of surfaces which means paved.
    06 mar 2024
  • mkgmap-r4917 fix typos in documentation: $LONG_DATE$ -> $LONGDATE$, $SHORT_DATE$ -> $SHORTDATE$.
    18 feb 2024
  • mkgmap-r4916 sortResource_v3.patch (with updated date in comment) by Ticker Berkin.
    13 oct 2023
See more...