From 373dc7ce367abf69117014df5d0e5559ee27a6b2 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Sat, 25 Aug 2018 21:28:33 +0200 Subject: [PATCH] Suspect Manager: who-did-it, hide-for --- .../java/btools/server/SuspectManager.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/brouter-server/src/main/java/btools/server/SuspectManager.java b/brouter-server/src/main/java/btools/server/SuspectManager.java index e1f3e08..4c298e4 100644 --- a/brouter-server/src/main/java/btools/server/SuspectManager.java +++ b/brouter-server/src/main/java/btools/server/SuspectManager.java @@ -193,8 +193,16 @@ public class SuspectManager extends Thread } if ( "fixed".equals( command ) ) { - new File( "fixedsuspects/" + id ).createNewFile(); + File fixedMarker = new File( "fixedsuspects/" + id ); + fixedMarker.createNewFile(); id = 0L; + + if ( tk.hasMoreTokens() ) + { + String param = tk.nextToken(); + int hideDays = Integer.parseInt( param ); + fixedMarker.setLastModified( System.currentTimeMillis() + hideDays*86400000L ); + } } } if ( id != 0L ) @@ -232,6 +240,8 @@ public class SuspectManager extends Thread String url4 = "https://overpass-turbo.eu/?Q=[date:"" + formatZ( weekAgo ) + "Z"];way[highway]({{bbox}});out meta geom;&C=" + dlat + ";" + dlon + ";18"; + String url5 = "https://simon04.dev.openstreetmap.org/whodidit/?zoom=13&lat=" + dlat + "&lon=" + dlon + "&layers=BTT"; + if ( message != null ) { bw.write( "" + message + "

\n" ); @@ -240,6 +250,7 @@ public class SuspectManager extends Thread 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( "Open in Who-Did-It / last week

\n" ); bw.write( "
\n" ); File fixedEntry = new File( "fixedsuspects/" + id ); if ( fixedEntry.exists() ) @@ -252,7 +263,14 @@ public class SuspectManager extends Thread File confirmedEntry = new File( "confirmednegatives/" + id ); if ( confirmedEntry.exists() ) { - bw.write( "mark as fixed

\n" ); + String prefix = "mark as fixed

\n" ); + bw.write( "hide for " ); + bw.write( prefix2 + "/7\">1 week" ); + bw.write( prefix2 + "/30\">1 month" ); + bw.write( prefix2 + "/91\">3 months" ); + bw.write( prefix2 + "/182\">6 months

\n" ); } else {