From 48d474d34cb1570a9befc07d7f8be3cf7bcad160 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Thu, 12 Sep 2024 12:25:06 +0200 Subject: [PATCH] switched from system to java variable --- .../main/java/btools/server/request/ServerHandler.java | 8 ++++---- misc/scripts/standalone/server.cmd | 2 +- misc/scripts/standalone/server.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java index 50f0766..37ba145 100644 --- a/brouter-server/src/main/java/btools/server/request/ServerHandler.java +++ b/brouter-server/src/main/java/btools/server/request/ServerHandler.java @@ -40,7 +40,7 @@ public class ServerHandler extends RequestHandler { private RoutingContext rc; - private static boolean useOldServerFormat = System.getenv("USEOLDSERVERFORMAT") != null; + private static boolean useRFCMimeType = Boolean.getBoolean("useRFCMimeType"); public ServerHandler(ServiceContext serviceContext, Map params) { super(serviceContext, params); @@ -109,10 +109,10 @@ public class ServerHandler extends RequestHandler { } else if ("kml".equals(format)) { result = "application/vnd.google-earth.kml+xml"; } else if ("geojson".equals(format)) { - if (useOldServerFormat) - result = "application/vnd.geo+json"; - else + if (useRFCMimeType) result = "application/geo+json"; + else + result = "application/vnd.geo+json"; } else if ("csv".equals(format)) { result = "text/tab-separated-values"; } diff --git a/misc/scripts/standalone/server.cmd b/misc/scripts/standalone/server.cmd index 4a5e0a3..e2fdb83 100644 --- a/misc/scripts/standalone/server.cmd +++ b/misc/scripts/standalone/server.cmd @@ -6,7 +6,7 @@ REM java -cp brouter.jar btools.brouter.RouteServer < pushd %~dp0 REM maxRunningTime is the request timeout in seconds, set to 0 to disable timeout -set JAVA_OPTS=-Xmx128M -Xms128M -Xmn8M -DmaxRunningTime=300 +set JAVA_OPTS=-Xmx128M -Xms128M -Xmn8M -DmaxRunningTime=300 -DuseRFCMimeType=false REM First search in locations matching the directory structure as found in the official BRouter zip archive set CLASSPATH=../brouter.jar diff --git a/misc/scripts/standalone/server.sh b/misc/scripts/standalone/server.sh index 83513a7..92d85f0 100755 --- a/misc/scripts/standalone/server.sh +++ b/misc/scripts/standalone/server.sh @@ -5,7 +5,7 @@ cd "$(dirname "$0")" # java -cp brouter.jar btools.brouter.RouteServer [bindaddress] # maxRunningTime is the request timeout in seconds, set to 0 to disable timeout -JAVA_OPTS="-Xmx128M -Xms128M -Xmn8M -DmaxRunningTime=300" +JAVA_OPTS="-Xmx128M -Xms128M -Xmn8M -DmaxRunningTime=300 -DuseRFCMimeType=false" # If paths are unset, first search in locations matching the directory structure # as found in the official BRouter zip archive