changed messages

PGWelch · Oct 18, 2017 · 6460384 · 6460384
1 parent 7b1086f
commit 6460384
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 80 deletions.
diff --git a/...om/opendoorlogistics/speedregions/graphhopper/ExperimentalUseSpeedRegionsWithCarGH05.java b/...om/opendoorlogistics/speedregions/graphhopper/ExperimentalUseSpeedRegionsWithCarGH05.java
@@ -29,6 +29,13 @@ public class ExperimentalUseSpeedRegionsWithCarGH05 {
 	 *
 	 */
 	public static void main(String[] strArgs) throws Exception {
+
+		// print java memory stuff so we can check correct xmx setting
+
+		System.out.println("Java max memory MB: " + (Runtime.getRuntime().maxMemory()/ (1024.0*1024.0)));
+		System.out.println("Java total memory MB: " + (Runtime.getRuntime().totalMemory()/ (1024.0*1024.0)));
+		System.out.println("Java free memory MB: " + (Runtime.getRuntime().freeMemory()/ (1024.0*1024.0)));
+
 		CmdArgs args = CmdArgs.read(strArgs);
 		if (args.getBool("odlwizardapp", false)) {
 			new RunWizardApp().runWizardApp(args);

diff --git a/...ntal.gh0.5/src/main/java/com/opendoorlogistics/speedregions/graphhopper/RunWizardApp.java b/...ntal.gh0.5/src/main/java/com/opendoorlogistics/speedregions/graphhopper/RunWizardApp.java
@@ -161,6 +161,17 @@ private void buildGraph(final CmdArgs mergedArgs, AppSettings settings,
 		EncodingManager myEncodingManager = new EncodingManager(newSpeedEncoders, bytesForFlags);
 		graphHopper.setEncodingManager(myEncodingManager);
 
+		System.out.println("");
+		System.out.println("############################");
+		System.out.println("");
+		System.out.println("Starting build of graph file, please wait.");
+		System.out.println("For small countries (e.g. Malta) this should take around 10 seconds");
+		System.out.println("For the UK it could take around 5 or 10 minutes.");
+		System.out.println("For the larger countries it will take longer.");		
+		System.out.println("");
+		System.out.println("############################");
+		System.out.println("");
+
 		LOGGER.info("Building graph");
 		ProcessTimer graphTimer = new ProcessTimer().start();
 		graphHopper.importOrLoad().close();

diff --git a/...s.excelshp/src/main/java/com/opendoorlogistics/speedregions/excelshp/app/AppSettings.java b/...s.excelshp/src/main/java/com/opendoorlogistics/speedregions/excelshp/app/AppSettings.java
@@ -5,7 +5,10 @@
 public class AppSettings {
 	private String pbfFile="";
 	private String outdirectory="";
-	private boolean useExcelShape;
+	/**
+	 * Default excelshp should be false so we get a simplified dialog for odl studio users
+	 */
+	private boolean useExcelShape=false;
 	private String excelfile="";
 	private String shapefile="";
 	private String idFieldNameInShapefile="";