From 494e9bebf9585165f9efc3ce144eba454c139f92 Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Mon, 19 Oct 2020 00:27:03 +0200 Subject: [PATCH] Add graph elevation provider in CLI --- .../java/com/graphhopper/matching/cli/ImportCommand.java | 5 +++++ .../main/java/com/graphhopper/matching/cli/MatchCommand.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/matching-web/src/main/java/com/graphhopper/matching/cli/ImportCommand.java b/matching-web/src/main/java/com/graphhopper/matching/cli/ImportCommand.java index 00c7c429..7f26e6dd 100644 --- a/matching-web/src/main/java/com/graphhopper/matching/cli/ImportCommand.java +++ b/matching-web/src/main/java/com/graphhopper/matching/cli/ImportCommand.java @@ -27,6 +27,10 @@ public void configure(Subparser subparser) { .type(String.class) .required(false) .setDefault("car"); + subparser.addArgument("--graph_elevation_provider") + .type(String.class) + .required(false) + .setDefault(""); } @Override @@ -36,6 +40,7 @@ public void run(Bootstrap bootstrap, Namespace args) { graphHopperConfiguration.putObject("graph.flag_encoders", vehicle); graphHopperConfiguration.putObject("datareader.file", args.getString("datasource")); graphHopperConfiguration.putObject("graph.location", "graph-cache"); + graphHopperConfiguration.putObject("graph.elevation.provider", args.getString("graph_elevation_provider")); // always using fastest weighting, see comment in MatchCommand String weightingStr = "fastest"; List profiles = new ArrayList<>(); diff --git a/matching-web/src/main/java/com/graphhopper/matching/cli/MatchCommand.java b/matching-web/src/main/java/com/graphhopper/matching/cli/MatchCommand.java index 4b68cc53..5928d118 100644 --- a/matching-web/src/main/java/com/graphhopper/matching/cli/MatchCommand.java +++ b/matching-web/src/main/java/com/graphhopper/matching/cli/MatchCommand.java @@ -64,12 +64,17 @@ public void configure(Subparser subparser) { .type(String.class) .required(false) .setDefault(""); + subparser.addArgument("--graph_elevation_provider") + .type(String.class) + .required(false) + .setDefault(""); } @Override public void run(Bootstrap bootstrap, Namespace args) { GraphHopperConfig graphHopperConfiguration = new GraphHopperConfig(); String ghFolder = "graph-cache"; + graphHopperConfiguration.putObject("graph.elevation.provider", args.getString("graph_elevation_provider")); graphHopperConfiguration.putObject("graph.location", ghFolder); String vehicle = args.getString("vehicle");