diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java index b45aec1..a3c4900 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java @@ -28,8 +28,8 @@ public class PosUnifier extends MapCreatorBase private CompactLongSet positionSet; private HashMap srtmmap; - private int lastStrmLonIdx; - private int lastStrmLatIdx; + private int lastSrtmLonIdx; + private int lastSrtmLatIdx; private SrtmRaster lastSrtmRaster; private String srtmdir; @@ -40,7 +40,7 @@ public class PosUnifier extends MapCreatorBase System.out.println( "*** PosUnifier: Unify position values and enhance elevation" ); if ( args.length != 5 ) { - System.out.println( "usage: java PosUnifier " ); + System.out.println( "usage: java PosUnifier " ); return; } new PosUnifier().process( new File( args[0] ), new File( args[1] ), new File( args[2] ), new File( args[3] ), args[4] ); @@ -145,12 +145,12 @@ public class PosUnifier extends MapCreatorBase { return null; } - if ( srtmLonIdx == lastStrmLonIdx && srtmLatIdx == lastStrmLatIdx ) + if ( srtmLonIdx == lastSrtmLonIdx && srtmLatIdx == lastSrtmLatIdx ) { return lastSrtmRaster; } - lastStrmLonIdx = srtmLonIdx; - lastStrmLatIdx = srtmLatIdx; + lastSrtmLonIdx = srtmLonIdx; + lastSrtmLatIdx = srtmLatIdx; StringBuilder sb = new StringBuilder( 16 ); sb.append( "srtm_" ); @@ -201,8 +201,8 @@ public class PosUnifier extends MapCreatorBase private void resetSrtm() { srtmmap = new HashMap(); - lastStrmLonIdx = -1; - lastStrmLatIdx = -1; + lastSrtmLonIdx = -1; + lastSrtmLatIdx = -1; lastSrtmRaster = null; } diff --git a/misc/pbfparser/README.txt b/misc/pbfparser/README.txt index d8f7d16..bd2bec6 100644 --- a/misc/pbfparser/README.txt +++ b/misc/pbfparser/README.txt @@ -15,9 +15,8 @@ folder brouter.jar in this folder -> compile the PBF-Parser using: javac -d . -cp protobuf.jar:osmosis.jar:brouter.jar *.java --> pack protobuf.jar + osmosis.jar + btools/**.class alltogether in a jar -"pbfparser.jar" with "jar cf pbfparser.jar protobuf.jar osmosis.jar -btools/**.class" +-> pack all the compiled class files together in a jar +"pbfparser.jar" with "jar cf pbfparser.jar btools/**/*.class" Alternatively, you can run the Mapcreator against a *xml.bz2 Database-Extract, then you don't need the pbf-parser. diff --git a/misc/scripts/mapcreation/all.brf b/misc/scripts/mapcreation/all.brf deleted file mode 100644 index 11de5a5..0000000 --- a/misc/scripts/mapcreation/all.brf +++ /dev/null @@ -1,18 +0,0 @@ ----context:global # following code refers to global config - -# the elevation parameters - -assign downhillcost 0 -assign downhillcutoff 1.5 -assign uphillcost 0 -assign uphillcutoff 1.5 - ----context:way # following code refers to way-tags - -assign turncost 0 -assign initialcost 0 -assign costfactor 1 - ----context:node # following code refers to node tags - -assign initialcost 0 diff --git a/misc/scripts/mapcreation/process_pbf_planet.sh b/misc/scripts/mapcreation/process_pbf_planet.sh index 2af9c06..36b635e 100755 --- a/misc/scripts/mapcreation/process_pbf_planet.sh +++ b/misc/scripts/mapcreation/process_pbf_planet.sh @@ -11,47 +11,62 @@ touch lastmaprun.date rm -rf /var/www/brouter/segments4_lastrun +JAVA='/java/bin/java -Xmx2600m -Xms2600m -Xmn32m' + +BROUTER_PROFILES=$(realpath "../../profiles2") + +BROUTER_JAR=$(realpath $(ls ../../../brouter-server/target/brouter-server-*-jar-with-dependencies.jar)) +OSMOSIS_JAR=$(realpath "../../pbfparser/osmosis.jar") +PROTOBUF_JAR=$(realpath "../../pbfparser/protobuf.jar") +PBFPARSER_JAR=$(realpath "../../pbfparser/pbfparser.jar") + +PLANET_FILE=$(realpath "./planet-latest.osm.pbf") +# Download SRTM zip files from +# https://cgiarcsi.community/data/srtm-90m-digital-elevation-database-v4-1/ +# (use the "ArcInfo ASCII" version) and put the ZIP files directly in this +# folder: +SRTM_PATH="/private-backup/srtm" + mkdir tmp cd tmp mkdir nodetiles -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -cp ../pbfparser.jar:../brouter.jar btools.mapcreator.OsmCutter ../lookups.dat nodetiles ways.dat relations.dat restrictions.dat ../all.brf ../planet-latest.osm.pbf +${JAVA} -cp "${OSMOSIS_JAR}:${PROTOBUF_JAR}:${PBFPARSER_JAR}:${BROUTER_JAR}" btools.mapcreator.OsmCutter ${BROUTER_PROFILES}/lookups.dat nodetiles ways.dat relations.dat restrictions.dat ${BROUTER_PROFILES}/all.brf ${PLANET_FILE} mkdir ftiles -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeFilter nodetiles ways.dat ftiles +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeFilter nodetiles ways.dat ftiles -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.RelationMerger ways.dat ways2.dat relations.dat ../lookups.dat ../trekking.brf ../softaccess.brf +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.RelationMerger ways.dat ways2.dat relations.dat ${BROUTER_PROFILES}/lookups.dat ${BROUTER_PROFILES}/trekking.brf ${BROUTER_PROFILES}/softaccess.brf mkdir waytiles -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter ftiles ways2.dat waytiles +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter ftiles ways2.dat waytiles mkdir waytiles55 -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter5 ftiles waytiles waytiles55 bordernids.dat +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.WayCutter5 ftiles waytiles waytiles55 bordernids.dat mkdir nodes55 -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeCutter ftiles nodes55 +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.NodeCutter ftiles nodes55 mkdir unodes55 -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.PosUnifier nodes55 unodes55 bordernids.dat bordernodes.dat /private-backup/srtm +${JAVA} -cp ${BROUTER_JAR} -Ddeletetmpfiles=true -DuseDenseMaps=true btools.mapcreator.PosUnifier nodes55 unodes55 bordernids.dat bordernodes.dat ${SRTM_PATH} mkdir segments - -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -DuseDenseMaps=true btools.mapcreator.WayLinker unodes55 waytiles55 bordernodes.dat restrictions.dat ../lookups.dat ../all.brf segments rd5 +${JAVA} -cp ${BROUTER_JAR} -DuseDenseMaps=true btools.mapcreator.WayLinker unodes55 waytiles55 bordernodes.dat restrictions.dat ${BROUTER_PROFILES}/lookups.dat ${BROUTER_PROFILES}/all.brf segments rd5 mkdir traffic -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 8.593025 49.724868 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 8.593025 49.724868 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 8.609011 50.527861 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 8.609011 50.527861 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 12.867994 51.239889 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 12.867994 51.239889 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 11.128099 49.501845 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 11.128099 49.501845 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 16.532815 49.169541 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 16.532815 49.169541 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600m -Xms2600m -Xmn32m -jar ../brouter.jar segments 16.917636 51.040949 seed 0 ../car-traffic_analysis.brf +${JAVA} -jar ${BROUTER_JAR} segments 16.917636 51.040949 seed 0 ${BROUTER_PROFILES}/car-traffic_analysis.brf -/java/bin/java -Xmx2600M -Xms2600M -Xmn32M -cp ../brouter.jar -DuseDenseMaps=true btools.mapcreator.WayLinker unodes55 waytiles55 bordernodes.dat restrictions.dat ../lookups.dat ../all.brf segments rd5 +${JAVA} -cp ${BROUTER_JAR} -DuseDenseMaps=true btools.mapcreator.WayLinker unodes55 waytiles55 bordernodes.dat restrictions.dat ${BROUTER_PROFILES}/lookups.dat ${BROUTER_PROFILES}/all.brf segments rd5 cd .. rm -rf segments diff --git a/misc/scripts/mapcreation/softaccess.brf b/misc/scripts/mapcreation/softaccess.brf deleted file mode 100644 index e657500..0000000 --- a/misc/scripts/mapcreation/softaccess.brf +++ /dev/null @@ -1,22 +0,0 @@ -# *** soft-access check used to prevent setting the cyclewaybit on motorroads - ----context:global # following code refers to global config - -assign validForBikes 1 - ----context:way # following code refers to way-tags - -assign costfactor - - # - # exclude motorways, proposed roads and motorroads - # - switch bicycle=yes 1 - switch or highway=motorway highway=motorway_link 100000 - switch highway=proposed 100000 - switch motorroad=yes 100000 - - 1 - ----context:node # following code refers to node tags -