Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

suspect-manager: dynamic polygon check

Browse source
This commit is contained in:
Arndt Brenschede 2018-09-12 20:29:37 +02:00
parent e25c531d2d
commit d7578fee03
3 changed files with 223 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
brouter-server/src/main/java/btools/server/Area.java Normal file
View file

@ -0,0 +1,76 @@
package btools.server;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class Area
{
private List<Polygon> poslist = new ArrayList<Polygon>();
private List<Polygon> neglist = new ArrayList<Polygon>();
public static void main( String[] args ) throws IOException
{
Area a = new Area( new File( args[0] ) );
System.out.println( args[1] + " is in " + args[0] + "=" + a.isInArea( Long.parseLong( args[1] ) ) );
}
public Area( File f ) throws IOException
{
BufferedReader br = new BufferedReader( new FileReader( f ) );
br.readLine();
for(;;)
{
String head = br.readLine();
if ( head == null || "END".equals( head ) )
{
break;
}
Polygon pol = new Polygon( br );
if ( head.startsWith( "!" ) )
{
neglist.add( pol );
}
else
{
poslist.add( pol );
}
}
}
public boolean isInArea( long id )
{
for( int i=0; i<poslist.size(); i++)
{
if ( poslist.get(i).isInPolygon( id ) )
{
for( int j=0; j<neglist.size(); j++)
{
if ( neglist.get(i).isInPolygon( id ) )
{
return false;
}
}
return true;
}
}
return false;
}
public boolean isInBoundingBox( long id )
{
for( int i=0; i<poslist.size(); i++)
{
if ( poslist.get(i).isInBoundingBox( id ) )
{
return true;
}
}
return false;
}
}

89
brouter-server/src/main/java/btools/server/Polygon.java Normal file
View file

@ -0,0 +1,89 @@
package btools.server;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.StringTokenizer;
public class Polygon
{
private int[] ax;
private int[] ay;
private int minx = Integer.MAX_VALUE;
private int miny = Integer.MAX_VALUE;
private int maxx = Integer.MIN_VALUE;
private int maxy = Integer.MIN_VALUE;
public Polygon( BufferedReader br ) throws IOException
{
ArrayList<String> lines = new ArrayList<String>();
for(;;)
{
String line = br.readLine();
if ( line == null || "END".equals( line ) )
{
break;
}
lines.add( line );
}
int n = lines.size();
ax = new int[n];
ay = new int[n];
for( int i=0; i<n; i++ )
{
String line = lines.get(i);
StringTokenizer tk = new StringTokenizer( line );
double lon = Double.parseDouble( tk.nextToken() );
double lat = Double.parseDouble( tk.nextToken() );
int x = ax[i] = (int)(lon*1000000. + 180000000);
int y = ay[i] = (int)(lat*1000000. + 90000000);
if ( x < minx ) minx = x;
if ( y < miny ) miny = y;
if ( x > maxx ) maxx = x;
if ( y > maxy ) maxy = y;
}
}
public boolean isInPolygon( long id )
{
int x = (int) ( id >> 32 );
int y = (int) ( id & 0xffffffff );
if ( x < minx || x > maxx || y < miny || y > maxy )
{
return false;
}
int n = ax.length-1; // these are closed polygons
boolean inside = false;
int j = n - 1;
for (int i = 0 ;i < n ; j = i++)
{
if ( (ay[i] > y) != (ay[j] > y) )
{
long v = ax[j] - ax[i];
v *= y - ay[i];
v /= ay[j] - ay[i];
if ( x <= v + ax[i])
{
inside = !inside;
}
}
}
return inside;
}
public boolean isInBoundingBox( long id )
{
int x = (int) ( id >> 32 );
int y = (int) ( id & 0xffffffff );
return x >= minx && x <= maxx && y >= miny && y <= maxy;
}
}

88
brouter-server/src/main/java/btools/server/SuspectManager.java
View file

@ -61,39 +61,46 @@ public class SuspectManager extends Thread
tk.nextToken(); tk.nextToken();
tk.nextToken(); tk.nextToken();
long id = 0L; long id = 0L;
String country = null; String country = "";
String filter = null; String filter = null;
if ( tk.hasMoreTokens() ) while ( tk.hasMoreTokens() )
{ {
String ctry = tk.nextToken(); String c = tk.nextToken();
if ( new File( "suspects/suspects_" + ctry + ".txt" ).exists() ) if ( "all".equals( c ) || "new".equals( c ) )
{ {
country = ctry; filter = c;
break;
}
country += "/" + c;
}
if ( tk.hasMoreTokens() ) if ( filter == null ) // generate country list
{
filter = tk.nextToken();
}
}
}
if ( country == null ) // generate country list
{ {
bw.write( "<table>\n" ); bw.write( "<table>\n" );
File[] files = new File( "suspects" ).listFiles(); File countryParent = new File( "worldpolys" + country );
File[] files = countryParent.listFiles();
TreeSet<String> names = new TreeSet<String>(); TreeSet<String> names = new TreeSet<String>();
for ( File f : files ) for ( File f : files )
{ {
String name = f.getName(); String name = f.getName();
if ( name.startsWith( "suspects_" ) && name.endsWith( ".txt" ) ) if ( name.endsWith( ".poly" ) )
{ {
names.add( name.substring( 9, name.length() - 4 ) ); names.add( name.substring( 0, name.length() - 5 ) );
} }
} }
for ( String ctry : names ) for ( String c : names )
{ {
String url2 = "/brouter/suspects/" + ctry; String url2 = "/brouter/suspects" + country + "/" + c;
bw.write( "<tr><td>" + ctry + "</td><td>&nbsp;<a href=\"" + url2 + "/new\">new</a>&nbsp;</td><td>&nbsp;<a href=\"" + url2 + "/all\">all</a>&nbsp;</td>\n" ); String linkNew = "<td>&nbsp;<a href=\"" + url2 + "/new\">new</a>&nbsp;</td>";
String linkAll = "<td>&nbsp;<a href=\"" + url2 + "/all\">all</a>&nbsp;</td>";
String linkSub = "";
if ( new File( countryParent, c ).exists() )
{
linkSub = "<td>&nbsp;<a href=\"" + url2 + "\">sub-regions</a>&nbsp;</td>";
}
bw.write( "<tr><td>" + c + "</td>" + linkNew + linkAll + linkSub + "\n" );
} }
bw.write( "</table>\n" ); bw.write( "</table>\n" );
bw.write( "</body></html>\n" ); bw.write( "</body></html>\n" );
@ -101,10 +108,21 @@ public class SuspectManager extends Thread
return; return;
} }
File suspectFile = new File( "suspects/suspects_" + country + ".txt" ); File polyFile = new File( "worldpolys" + country + ".poly" );
if ( !polyFile.exists() )
{
bw.write( "polygon file for country '" + country + "' not found\n" );
bw.write( "</body></html>\n" );
bw.flush();
return;
}
Area polygon = new Area( polyFile );
File suspectFile = new File( "worldsuspects.txt" );
if ( !suspectFile.exists() ) if ( !suspectFile.exists() )
{ {
bw.write( "suspect file for country '" + country + "' not found\n" ); bw.write( "suspect file worldsuspects.txt not found\n" );
bw.write( "</body></html>\n" ); bw.write( "</body></html>\n" );
bw.flush(); bw.flush();
return; return;
@ -152,12 +170,16 @@ public class SuspectManager extends Thread
{ {
continue; continue;
} }
if ( !polygon.isInArea( id ) )
{
continue; // not in selected polygon
}
String hint = "&nbsp;&nbsp;&nbsp;confirmed " + formatAge( confirmedEntry ) + " ago"; String hint = "&nbsp;&nbsp;&nbsp;confirmed " + formatAge( confirmedEntry ) + " ago";
int ilon = (int) ( id >> 32 ); int ilon = (int) ( id >> 32 );
int ilat = (int) ( id & 0xffffffff ); int ilat = (int) ( id & 0xffffffff );
double dlon = ( ilon - 180000000 ) / 1000000.; double dlon = ( ilon - 180000000 ) / 1000000.;
double dlat = ( ilat - 90000000 ) / 1000000.; double dlat = ( ilat - 90000000 ) / 1000000.;
String url2 = "/brouter/suspects/" + countryId; String url2 = "/brouter/suspects" + countryId;
bw.write( "<a href=\"" + url2 + "\">" + dlon + "," + dlat + "</a>" + hint + "<br>\n" ); bw.write( "<a href=\"" + url2 + "\">" + dlon + "," + dlat + "</a>" + hint + "<br>\n" );
} }
r.close(); r.close();
@ -270,11 +292,11 @@ public class SuspectManager extends Thread
} }
else else
{ {
bw.write( "<a href=\"/brouter/suspects/" + countryId + "/falsepositive\">mark false positive (=not an issue)</a><br><br>\n" ); bw.write( "<a href=\"/brouter/suspects" + countryId + "/falsepositive\">mark false positive (=not an issue)</a><br><br>\n" );
File confirmedEntry = new File( "confirmednegatives/" + id ); File confirmedEntry = new File( "confirmednegatives/" + id );
if ( confirmedEntry.exists() ) if ( confirmedEntry.exists() )
{ {
String prefix = "<a href=\"/brouter/suspects/" + countryId + "/fixed"; String prefix = "<a href=\"/brouter/suspects" + countryId + "/fixed";
String prefix2 = " &nbsp;&nbsp;" + prefix; String prefix2 = " &nbsp;&nbsp;" + prefix;
bw.write( prefix + "\">mark as fixed</a><br><br>\n" ); bw.write( prefix + "\">mark as fixed</a><br><br>\n" );
bw.write( "hide for " ); bw.write( "hide for " );
@ -285,15 +307,15 @@ public class SuspectManager extends Thread
} }
else else
{ {
bw.write( "<a href=\"/brouter/suspects/" + countryId + "/confirm\">mark as a confirmed issue</a><br><br>\n" ); bw.write( "<a href=\"/brouter/suspects" + countryId + "/confirm\">mark as a confirmed issue</a><br><br>\n" );
} }
bw.write( "<br><br><a href=\"/brouter/suspects/" + country + "/" + filter + "\">back to issue list</a><br><br>\n" ); bw.write( "<br><br><a href=\"/brouter/suspects" + country + "/" + filter + "\">back to issue list</a><br><br>\n" );
} }
} }
else else
{ {
bw.write( filter + " suspect list for " + country + "\n" ); bw.write( filter + " suspect list for " + country + "\n" );
bw.write( "<br><a href=\"/brouter/suspects/" + country + "/" + filter + "/watchlist\">see watchlist</a>\n" ); bw.write( "<br><a href=\"/brouter/suspects" + country + "/" + filter + "/watchlist\">see watchlist</a>\n" );
bw.write( "<br><a href=\"/brouter/suspects\">back to country list</a><br><br>\n" ); bw.write( "<br><a href=\"/brouter/suspects\">back to country list</a><br><br>\n" );
int maxprio = 0; int maxprio = 0;
for ( int pass = 1; pass <= 2; pass++ ) for ( int pass = 1; pass <= 2; pass++ )
@ -327,9 +349,11 @@ public class SuspectManager extends Thread
} }
id = Long.parseLong( idString ); id = Long.parseLong( idString );
String countryId = country + "/" + filter + "/" + id;
String hint = "";
if ( !polygon.isInBoundingBox( id ) )
{
continue; // not in selected polygon (pre-check)
}
if ( new File( "falsepositives/" + id ).exists() ) if ( new File( "falsepositives/" + id ).exists() )
{ {
continue; // known false positive continue; // known false positive
@ -342,12 +366,18 @@ public class SuspectManager extends Thread
{ {
continue; // known fixed continue; // known fixed
} }
if ( !polygon.isInArea( id ) )
{
continue; // not in selected polygon
}
if ( pass == 1 ) if ( pass == 1 )
{ {
maxprio = prio; maxprio = prio;
continue; continue;
} }
String countryId = country + "/" + filter + "/" + id;
File confirmedEntry = new File( "confirmednegatives/" + id ); File confirmedEntry = new File( "confirmednegatives/" + id );
String hint = "";
if ( confirmedEntry.exists() ) if ( confirmedEntry.exists() )
{ {
hint = "&nbsp;&nbsp;&nbsp;confirmed " + formatAge( confirmedEntry ) + " ago"; hint = "&nbsp;&nbsp;&nbsp;confirmed " + formatAge( confirmedEntry ) + " ago";
@ -356,7 +386,7 @@ public class SuspectManager extends Thread
int ilat = (int) ( id & 0xffffffff ); int ilat = (int) ( id & 0xffffffff );
double dlon = ( ilon - 180000000 ) / 1000000.; double dlon = ( ilon - 180000000 ) / 1000000.;
double dlat = ( ilat - 90000000 ) / 1000000.; double dlat = ( ilat - 90000000 ) / 1000000.;
String url2 = "/brouter/suspects/" + countryId; String url2 = "/brouter/suspects" + countryId;
bw.write( "<a href=\"" + url2 + "\">" + dlon + "," + dlat + "</a>" + hint + "<br>\n" ); bw.write( "<a href=\"" + url2 + "\">" + dlon + "," + dlat + "</a>" + hint + "<br>\n" );
} }
r.close(); r.close();