Commit 8fbf07a7 authored by Sebastian Hörl's avatar Sebastian Hörl

Merge branch 'fix-geotools' into 'master'

Fix geotools once more

See merge request !77
parents 18bb146f b821a2a9
Pipeline #61369 passed with stage
in 272 minutes and 35 seconds
**Version v2 (master)**
- Update Maven dependency
- Update eqasim to 1.0.5
- Upgrade to new pt2matsim version to allow selecting of HAFAS date
- Store STATPOP and MZ ids as agents attributes
......
......@@ -12,9 +12,9 @@ jdk_version="8u212"
jdk_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz"
jdk_sha256="dd28d6d2cde2b931caf94ac2422a2ad082ea62f0beee3bf7057317c53093de93"
maven_version="3.6.1"
maven_version="3.6.3"
maven_url="http://mirror.easyname.ch/apache/maven/maven-3/${maven_version}/binaries/apache-maven-${maven_version}-bin.tar.gz"
maven_sha512="b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544"
maven_sha512="c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0"
# Define Python requirements
python_requirements=$(cat <<EOF
......
......@@ -29,4 +29,4 @@ def execute(context):
assert(os.path.exists("%s/test_config.xml" % context.cache_path))
assert(os.path.exists("%s/java_tmp/GeoTools" % context.cache_path))
return jar
return jar, "%s/java_tmp" % context.cache_path
......@@ -7,7 +7,7 @@ def configure(context, require):
require.config("raw_data_path")
def execute(context):
jar = context.stage("matsim.java.pt2matsim")
jar, tmp_path = context.stage("matsim.java.pt2matsim")
java = context.stage("utils.java")
# Create MATSim schedule
......@@ -17,7 +17,7 @@ def execute(context):
"%s/transit_schedule.xml.gz" % context.cache_path,
"%s/transit_vehicles.xml.gz" % context.cache_path,
context.config["hafas_date"]
], cwd = context.cache_path)
], cwd = context.cache_path, vm_arguments = ["-Djava.io.tmpdir=%s" % tmp_path])
assert(os.path.exists("%s/transit_schedule.xml.gz" % context.cache_path))
assert(os.path.exists("%s/transit_vehicles.xml.gz" % context.cache_path))
......
......@@ -7,14 +7,14 @@ def configure(context, require):
require.config("raw_data_path")
def execute(context):
jar = context.stage("matsim.java.pt2matsim")
jar, tmp_path = context.stage("matsim.java.pt2matsim")
java = context.stage("utils.java")
# Create MATSim network
java(jar, "org.matsim.pt2matsim.run.CreateDefaultOsmConfig", [
"convert_network_template.xml"
], cwd = context.cache_path)
], cwd = context.cache_path, vm_arguments = ["-Djava.io.tmpdir=%s" % tmp_path])
content = open("%s/convert_network_template.xml" % context.cache_path).read()
......@@ -58,7 +58,7 @@ def execute(context):
java(jar, "org.matsim.pt2matsim.run.Osm2MultimodalNetwork", [
"convert_network.xml"
], cwd = context.cache_path)
], cwd = context.cache_path, vm_arguments = ["-Djava.io.tmpdir=%s" % tmp_path])
assert(os.path.exists("%s/converted_network.xml.gz" % context.cache_path))
return "%s/converted_network.xml.gz" % context.cache_path
......@@ -8,7 +8,7 @@ def configure(context, require):
require.stage("matsim.network.convert_hafas")
def execute(context):
jar = context.stage("matsim.java.pt2matsim")
jar, tmp_path = context.stage("matsim.java.pt2matsim")
java = context.stage("utils.java")
unmapped_network_path = context.stage("matsim.network.convert_osm")
......@@ -18,7 +18,7 @@ def execute(context):
java(jar, "org.matsim.pt2matsim.run.CreateDefaultPTMapperConfig", [
"map_network_template.xml"
], cwd = context.cache_path)
], cwd = context.cache_path, vm_arguments = ["-Djava.io.tmpdir=%s" % tmp_path])
content = open("%s/map_network_template.xml" % context.cache_path).read()
......@@ -57,7 +57,7 @@ def execute(context):
java(jar, "org.matsim.pt2matsim.run.PublicTransitMapper", [
"map_network.xml"
], cwd = context.cache_path)
], cwd = context.cache_path, vm_arguments = ["-Djava.io.tmpdir=%s" % tmp_path])
assert(os.path.exists("%s/mapped_network.xml.gz" % context.cache_path))
assert(os.path.exists("%s/mapped_schedule.xml.gz" % context.cache_path))
......
......@@ -8,12 +8,13 @@ def configure(context, require):
def execute(context):
java = context.stage("utils.java")
jar = context.stage("matsim.java.pt2matsim")
jar, tmp_path = context.stage("matsim.java.pt2matsim")
paths = context.stage("matsim.network.mapped")
# Do plausibility checks
java(jar, "org.matsim.pt2matsim.run.CheckMappedSchedulePlausibility", [
"-Djava.io.tmpdir=%s/java_tmp" % tmp_path,
paths["schedule"], paths["network"], "EPSG:2056", context.cache_path
], cwd = context.cache_path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment