From 337ee21d1760ad1f6b4b4cc4d1f7973edcf9920e Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Sun, 19 Aug 2018 11:33:34 +0200 Subject: [PATCH] Suspect-Manager: josm+overpass links --- .../java/btools/server/SuspectManager.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/brouter-server/src/main/java/btools/server/SuspectManager.java b/brouter-server/src/main/java/btools/server/SuspectManager.java index 98c155d..e1f3e08 100644 --- a/brouter-server/src/main/java/btools/server/SuspectManager.java +++ b/brouter-server/src/main/java/btools/server/SuspectManager.java @@ -5,11 +5,23 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.StringTokenizer; import java.util.TreeSet; public class SuspectManager extends Thread { + private static SimpleDateFormat dfTimestampZ = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss" ); + + private static String formatZ( Date date ) + { + synchronized( dfTimestampZ ) + { + return dfTimestampZ.format( date ); + } + } + private static String formatAge( File f ) { long age = System.currentTimeMillis() - f.lastModified(); @@ -43,7 +55,7 @@ public class SuspectManager extends Thread public static void process( String url, BufferedWriter bw ) throws IOException { bw.write( "\n" ); - bw.write( "BRouter suspect manager. Help " ); + bw.write( "BRouter suspect manager. Help

\n" ); StringTokenizer tk = new StringTokenizer( url, "/" ); tk.nextToken(); @@ -81,7 +93,7 @@ public class SuspectManager extends Thread for ( String ctry : names ) { String url2 = "/brouter/suspects/" + ctry; - bw.write( "" + ctry + "newall\n" ); + bw.write( "" + ctry + " new  all \n" ); } bw.write( "\n" ); bw.write( "\n" ); @@ -204,7 +216,7 @@ public class SuspectManager extends Thread } String url1 = "http://brouter.de/brouter-web/#zoom=18&lat=" + dlat + "&lon=" + dlon - + "&layer=OpenStreetMap&lonlats=" + dlon + "," + dlat + "&profile=" + profile; + + "&lonlats=" + dlon + "," + dlat + "&profile=" + profile; // String url1 = "http://localhost:8080/brouter-web/#map=18/" + dlat + "/" // + dlon + "/Mapsforge Tile Server&lonlats=" + dlon + "," + dlat; @@ -213,9 +225,13 @@ public class SuspectManager extends Thread double slon = 0.00156; double slat = 0.001; - String url3 = "http://osmose.openstreetmap.fr/de/josm_proxy?load_and_zoom?left=" + ( dlon - slon ) + String url3 = "http://127.0.0.1:8111/load_and_zoom?left=" + ( dlon - slon ) + "&bottom=" + ( dlat - slat ) + "&right=" + ( dlon + slon ) + "&top=" + ( dlat + slat ); + Date weekAgo = new Date( System.currentTimeMillis() - 604800000L ); + String url4 = "https://overpass-turbo.eu/?Q=[date:"" + formatZ( weekAgo ) + "Z"];way[highway]({{bbox}});out meta geom;&C=" + + dlat + ";" + dlon + ";18"; + if ( message != null ) { bw.write( "" + message + "

\n" ); @@ -223,6 +239,8 @@ public class SuspectManager extends Thread bw.write( "Open in BRouter-Web

\n" ); bw.write( "Open in OpenStreetmap

\n" ); bw.write( "Open in JOSM (via remote control)

\n" ); + bw.write( "Open in Overpass / minus one week

\n" ); + bw.write( "
\n" ); File fixedEntry = new File( "fixedsuspects/" + id ); if ( fixedEntry.exists() ) {