Index: /tools/routingservice/trunk/src/jp/co/orkney/restlet/geo/ShortestPath.java =================================================================== --- /tools/routingservice/trunk/src/jp/co/orkney/restlet/geo/ShortestPath.java (revision 199) +++ /tools/routingservice/trunk/src/jp/co/orkney/restlet/geo/ShortestPath.java (revision 252) @@ -165,4 +165,5 @@ { + this.log.write("Distance limit is "+configuration.getService().getLimit().getDistance(), 2); // Makes the SQL query query.setAttribute("sonStartX", startPoint.getX()); Index: /tools/routingservice/trunk/src/jp/co/orkney/restlet/util/Configuration.java =================================================================== --- /tools/routingservice/trunk/src/jp/co/orkney/restlet/util/Configuration.java (revision 172) +++ /tools/routingservice/trunk/src/jp/co/orkney/restlet/util/Configuration.java (revision 252) @@ -217,5 +217,5 @@ } - service.setLimit(limit); + //service.setLimit(limit); List listSQL = currentService.getChild("sql") Index: /tools/routingservice/trunk/configuration.xml =================================================================== --- /tools/routingservice/trunk/configuration.xml (revision 199) +++ /tools/routingservice/trunk/configuration.xml (revision 252) @@ -2,518 +2,30 @@ 8182 - ./log/access.log + ./log/access.log http://localhost http://localhost/demo/css/style.css - - - - no description + + + Orkney ルヌト怜玢甚道路デヌタ 䜿甚蚱諟契玄曞 - no description + Returns the closest node link to an arbitrary point - jdbc:postgresql://192.168.20.177:5432/geobase - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM nrn_bc WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM nrn_bc WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM nrn_bc WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM nrn_bc WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/geobase - postgres - - - - - - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('nrn_bc', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('nrn_bc', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('nrn_bc', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('nrn_bc', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/geobase - postgres - - - - - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM nrn_bc'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''nrn_bc'''')),$distance$,false,false) a, nrn_bc b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM nrn_bc'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''nrn_bc'''')),$distance$,false,false) a, nrn_bc b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM nrn_bc'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''nrn_bc'''')),$distance$,false,false) a, nrn_bc b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM nrn_bc'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''nrn_bc'''')),$distance$,false,false) a, nrn_bc b WHERE a.vertex_id = b.source'); - - - - - - - - - - - - - - - - > - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/geobase - postgres - - - - - SELECT gid, AsText(the_geom) AS wkt FROM tsp_astar_directed_smart('nrn_bc','$sesSteps$', (select id from find_node_by_nearest_link_within_distance('POINT($sonStartX$ $sonStartY$)',$bbox$,'nrn_bc')),$bbox$,false,false); - SELECT gid, AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM tsp_astar_directed_smart('nrn_bc','$sesSteps$', (select id from find_node_by_nearest_link_within_distance('POINT($sonStartX$ $sonStartY$)',$bbox$,'nrn_bc')),$bbox$,false,false); - SELECT gid, AsText(the_geom) AS wkt FROM tsp_astar_directed_smart('nrn_bc','$sesSteps$', (select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonStartX$ $sonStartY$)'''',$sridIn$,$sridProvider$),$bbox$,'nrn_bc')),$bbox$,false,false); - SELECT gid, AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM tsp_astar_directed_smart('nrn_bc','$sesSteps$', (select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonStartX$ $sonStartY$)'''',$sridIn$,$sridProvider$),$bbox$,'nrn_bc')),$bbox$,false,false); - - - - - - - - - - - - - - - - > - - - - - - - - - - - - blabla - - - blabla - - jdbc:postgresql://192.168.20.177:5432/ipc - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM ipc_trn WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM ipc_trn WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM ipc_trn WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM ipc_trn WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/ipc - postgres - - - - - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('ipc_trn', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('ipc_trn', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('ipc_trn', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('ipc_trn', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/ipc - postgres - - - - - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM ipc_trn'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''ipc_trn'''')),$distance$,false,false) a, ipc_trn b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM ipc_trn'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''ipc_trn'''')),$distance$,false,false) a, ipc_trn b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM ipc_trn'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''ipc_trn'''')),$distance$,false,false) a, ipc_trn b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM ipc_trn'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''ipc_trn'''')),$distance$,false,false) a, ipc_trn b WHERE a.vertex_id = b.source'); - - - - - - - - - - - - - - - - > - - - - - - - - Authentication service - - jdbc:postgresql://192.168.20.177:5432/auth - postgres - - - - - SELECT client_id, key FROM keys - - - - - - - - - - - - - - - - no description - - - >no description - - jdbc:postgresql://192.168.20.177:5432/suuchi - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM kanagawa WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM kanagawa WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM kanagawa WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM kanagawa WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/suuchi + jdbc:postgresql://127.0.0.1:5432/hcc postgres + - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('kanagawa', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('kanagawa', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('kanagawa', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('kanagawa', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) + SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM hcc_20090121 WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 + SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM hcc_20090121 WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 + SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM hcc_20090121 WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 + SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM hcc_20090121 WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - > - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/suuchi - postgres - - - - - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM kanagawa'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''kanagawa'''')),$distance$,false,false) a, kanagawa b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM kanagawa'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''kanagawa'''')),$distance$,false,false) a, kanagawa b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM kanagawa'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''kanagawa'''')),$distance$,false,false) a, kanagawa b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM kanagawa'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''kanagawa'''')),$distance$,false,false) a, kanagawa b WHERE a.vertex_id = b.source'); - - - - - - - - - - - - - - - - > - - - - - - - - - - - no description - - - >no description - - jdbc:postgresql://192.168.20.177:5432/pgrouting - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM suuchi_kanagawa_topo WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM suuchi_kanagawa_topo WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM suuchi_kanagawa_topo WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM suuchi_kanagawa_topo WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/pgrouting - postgres - - - - - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('suuchi_kanagawa_topo', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('suuchi_kanagawa_topo', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('suuchi_kanagawa_topo', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('suuchi_kanagawa_topo', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - - - - - - - - - - - - - - > - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/pgrouting - postgres - - - - - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM suuchi_kanagawa_topo'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''suuchi_kanagawa_topo'''')),$distance$,false,false) a, suuchi_kanagawa_topo b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM suuchi_kanagawa_topo'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''suuchi_kanagawa_topo'''')),$distance$,false,false) a, suuchi_kanagawa_topo b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM suuchi_kanagawa_topo'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''suuchi_kanagawa_topo'''')),$distance$,false,false) a, suuchi_kanagawa_topo b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM suuchi_kanagawa_topo'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''suuchi_kanagawa_topo'''')),$distance$,false,false) a, suuchi_kanagawa_topo b WHERE a.vertex_id = b.source'); - - - - - - - - - - - - - - - - > - - - - - - - - - - - - no description - - - >no description - - jdbc:postgresql://192.168.20.177:5432/hcc - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM road_link_5339 WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM road_link_5339 WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM road_link_5339 WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM road_link_5339 WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - + @@ -532,18 +44,19 @@ - + - blabla + Returns the shortest path between two arbitrary points - jdbc:postgresql://192.168.20.177:5432/hcc + jdbc:postgresql://127.0.0.1:5432/hcc postgres - + + - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('road_link_5339', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('road_link_5339', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('road_link_5339', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('road_link_5339', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) + SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('hcc_20090121', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) + SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('hcc_20090121', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) + SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('hcc_20090121', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) + SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('hcc_20090121', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) @@ -556,27 +69,27 @@ - - - - > + + + + - - + + - + - blabla + Returns a driving distance polygon - jdbc:postgresql://192.168.20.177:5432/hcc + jdbc:postgresql://127.0.0.1:5432/hcc postgres - + - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM road_link_5339'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''road_link_5339'''')),$distance$,false,false) a, road_link_5339 b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM road_link_5339'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''road_link_5339'''')),$distance$,false,false) a, road_link_5339 b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM road_link_5339'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''road_link_5339'''')),$distance$,false,false) a, road_link_5339 b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM road_link_5339'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''road_link_5339'''')),$distance$,false,false) a, road_link_5339 b WHERE a.vertex_id = b.source'); + SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM hcc_20090121'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''hcc_20090121'''')),$distance$,false,false) a, hcc_20090121 b WHERE a.vertex_id = b.source'); + SELECT AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM hcc_20090121'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''hcc_20090121'''')),$distance$,false,false) a, hcc_20090121 b WHERE a.vertex_id = b.source'); + SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM '''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''hcc_20090121'''')),$distance$,false,false) a, hcc_20090121 b WHERE a.vertex_id = b.source'); + SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM hcc_20090121'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''hcc_20090121'''')),$distance$,false,false) a, hcc_20090121 b WHERE a.vertex_id = b.source'); @@ -594,113 +107,5 @@ - > - - - - - - - - - - - - no description - - - >no description - - jdbc:postgresql://192.168.20.177:5432/suuchi - postgres - - - - - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM tohoku_chihou WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, GeometryFromText('POINT($sonPx$ $sonPy$)',$sridProvider$)) AS dist FROM tohoku_chihou WHERE the_geom && setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(the_geom) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM tohoku_chihou WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - SELECT gid, source, target, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt, distance(the_geom, transform(GeometryFromText('POINT($sonPx$ $sonPy$)',$sridIn$),$sridProvider$)) AS dist FROM tohoku_chihou WHERE the_geom && transform(setsrid('BOX3D($sonPxM$ $sonPyM$,$sonPxP$ $sonPyP$)'::box3d, $sridIn$), $sridProvider$) ORDER BY dist LIMIT 1 - - - - - - - - - - - - - - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/suuchi - postgres - - - - - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('tohoku_chihou', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('tohoku_chihou', $sonStartX$, $sonStartY$, $sonEndX$, $sonEndY$, $saBoxSize$,'length',true,true) - SELECT gid, AsText(the_geom) AS wkt FROM shootingstar_sp_smart('tohoku_chihou', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - SELECT gid, AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM shootingstar_sp_smart('tohoku_chihou', X(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonStartX$ $sonStartY$)',$sridIn$),$sridProvider$)), X(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), Y(transform(GeometryFromText('POINT($sonEndX$ $sonEndY$)',$sridIn$),$sridProvider$)), $saBoxSize$,'length',true,true) - - - - - - - - - - - - - - > - - - - - - - - blabla - - jdbc:postgresql://192.168.20.177:5432/suuchi - postgres - - - - - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM tohoku_chihou'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''tohoku_chihou'''')),$distance$,false,false) a, tohoku_chihou b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setsrid(the_geom, $sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM tohoku_chihou'''',(select id from find_node_by_nearest_link_within_distance(''''POINT($sonPx$ $sonPy$)'''',$bbox$,''''tohoku_chihou'''')),$distance$,false,false) a, tohoku_chihou b WHERE a.vertex_id = b.source'); - SELECT AsText(the_geom) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM tohoku_chihou'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''tohoku_chihou'''')),$distance$,false,false) a, tohoku_chihou b WHERE a.vertex_id = b.source'); - SELECT AsText(transform(setSRID(the_geom,$sridProvider$), $sridOut$)) AS wkt FROM points_as_polygon('SELECT a.vertex_id::integer AS id, b.x1::double precision AS x, b.y1::double precision AS y FROM driving_distance(''''SELECT gid AS id,source::integer,target::integer,length::double precision AS cost FROM tohoku_chihou'''',(select id from find_node_by_nearest_link_within_distance(text2text_transform(''''POINT($sonPx$ $sonPy$)'''',$sridIn$,$sridProvider$),$bbox$,''''tohoku_chihou'''')),$distance$,false,false) a, tohoku_chihou b WHERE a.vertex_id = b.source'); - - - - - - - - - - - - - - - - > Index: /tools/routingservice/trunk/start.sh =================================================================== --- /tools/routingservice/trunk/start.sh (revision 195) +++ /tools/routingservice/trunk/start.sh (revision 252) @@ -1,1 +1,1 @@ -java -cp .:jp/co/orkney/restlet:lib/antlrworks-1.1.3.jar:lib/org.restlet.ext.json_2.0.jar:lib/com.noelios.restlet.ext.simple_3.1.jar:lib/org.restlet.jar:lib/com.noelios.restlet.jar:lib/org.simpleframework.jar:lib/jdom.jar:lib/postgresql-8.2-508.jdbc3.jar:lib/org.json.jar:lib/commons-dbcp-1.2.2.jar:lib/commons-pool-1.4.jar:lib/com.noelios.restlet.ext.jdbc_3.0.jar jp.co.orkney.restlet.WebRouting & +java -cp .:jp/co/orkney/restlet:lib/antlrworks-1.1.3.jar:lib/org.restlet.ext.json_2.0.jar:lib/com.noelios.restlet.ext.simple_3.1.jar:lib/org.restlet.jar:lib/com.noelios.restlet.jar:lib/org.simpleframework.jar:lib/jdom.jar:lib/postgresql-8.1-413.jdbc3.jar:lib/org.json.jar:lib/commons-dbcp-1.2.2.jar:lib/commons-pool-1.4.jar:lib/com.noelios.restlet.ext.jdbc_3.0.jar jp.co.orkney.restlet.WebRouting & Index: /tools/routingservice/trunk/security/extractor/Base64Coder.java =================================================================== --- /tools/routingservice/trunk/security/extractor/Base64Coder.java (revision 252) +++ /tools/routingservice/trunk/security/extractor/Base64Coder.java (revision 252) @@ -0,0 +1,143 @@ +/** +* A Base64 Encoder/Decoder. +* +*

+* This class is used to encode and decode data in Base64 format as described in RFC 1521. +* +*

+* This is "Open Source" software and released under the GNU/LGPL license.
+* It is provided "as is" without warranty of any kind.
+* Copyright 2003: Christian d'Heureuse, Inventec Informatik AG, Switzerland.
+* Home page: www.source-code.biz
+* +*

+* Version history:
+* 2003-07-22 Christian d'Heureuse (chdh): Module created.
+* 2005-08-11 chdh: Lincense changed from GPL to LGPL.
+* 2006-11-21 chdh:
+*   Method encode(String) renamed to encodeString(String).
+*   Method decode(String) renamed to decodeString(String).
+*   New method encode(byte[],int) added.
+*   New method decode(String) added.
+*/ + +public class Base64Coder { + +// Mapping table from 6-bit nibbles to Base64 characters. +private static char[] map1 = new char[64]; + static { + int i=0; + for (char c='A'; c<='Z'; c++) map1[i++] = c; + for (char c='a'; c<='z'; c++) map1[i++] = c; + for (char c='0'; c<='9'; c++) map1[i++] = c; + map1[i++] = '+'; map1[i++] = '/'; } + +// Mapping table from Base64 characters to 6-bit nibbles. +private static byte[] map2 = new byte[128]; + static { + for (int i=0; iin. +* @return A character array with the Base64 encoded data. +*/ +public static char[] encode (byte[] in, int iLen) { + int oDataLen = (iLen*4+2)/3; // output length without padding + int oLen = ((iLen+2)/3)*4; // output length including padding + char[] out = new char[oLen]; + int ip = 0; + int op = 0; + while (ip < iLen) { + int i0 = in[ip++] & 0xff; + int i1 = ip < iLen ? in[ip++] & 0xff : 0; + int i2 = ip < iLen ? in[ip++] & 0xff : 0; + int o0 = i0 >>> 2; + int o1 = ((i0 & 3) << 4) | (i1 >>> 4); + int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6); + int o3 = i2 & 0x3F; + out[op++] = map1[o0]; + out[op++] = map1[o1]; + out[op] = op < oDataLen ? map1[o2] : '='; op++; + out[op] = op < oDataLen ? map1[o3] : '='; op++; } + return out; } + +/** +* Decodes a string from Base64 format. +* @param s a Base64 String to be decoded. +* @return A String containing the decoded data. +* @throws IllegalArgumentException if the input is not valid Base64 encoded data. +*/ +public static String decodeString (String s) { + return new String(decode(s)); } + +/** +* Decodes a byte array from Base64 format. +* @param s a Base64 String to be decoded. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException if the input is not valid Base64 encoded data. +*/ +public static byte[] decode (String s) { + return decode(s.toCharArray()); } + +/** +* Decodes a byte array from Base64 format. +* No blanks or line breaks are allowed within the Base64 encoded data. +* @param in a character array containing the Base64 encoded data. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException if the input is not valid Base64 encoded data. +*/ +public static byte[] decode (char[] in) { + int iLen = in.length; + if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64 encoded input string is not a multiple of 4."); + while (iLen > 0 && in[iLen-1] == '=') iLen--; + int oLen = (iLen*3) / 4; + byte[] out = new byte[oLen]; + int ip = 0; + int op = 0; + while (ip < iLen) { + int i0 = in[ip++]; + int i1 = in[ip++]; + int i2 = ip < iLen ? in[ip++] : 'A'; + int i3 = ip < iLen ? in[ip++] : 'A'; + if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127) + throw new IllegalArgumentException ("Illegal character in Base64 encoded data."); + int b0 = map2[i0]; + int b1 = map2[i1]; + int b2 = map2[i2]; + int b3 = map2[i3]; + if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0) + throw new IllegalArgumentException ("Illegal character in Base64 encoded data."); + int o0 = ( b0 <<2) | (b1>>>4); + int o1 = ((b1 & 0xf)<<4) | (b2>>>2); + int o2 = ((b2 & 3)<<6) | b3; + out[op++] = (byte)o0; + if (op "); + System.exit(1); + } + ExportPriv myep = new ExportPriv(); + myep.doit(args[0], args[1], args[2]); + } + + public void doit(String fileName, String aliasName, String pass) throws Exception{ + + KeyStore ks = KeyStore.getInstance("JKS"); + + char[] passPhrase = pass.toCharArray(); + //BASE64Encoder myB64 = new BASE64Encoder(); + + File certificateFile = new File(fileName); + ks.load(new FileInputStream(certificateFile), passPhrase); + + KeyPair kp = getPrivateKey(ks, aliasName, passPhrase); + + PrivateKey privKey = kp.getPrivate(); + + char[] b64 = Base64Coder.encode(privKey.getEncoded()); + + System.out.println("-----BEGIN PRIVATE KEY-----"); + System.out.println(b64); + System.out.println("-----END PRIVATE KEY-----"); + + } + +// From http://javaalmanac.com/egs/java.security/GetKeyFromKs.html + + public KeyPair getPrivateKey(KeyStore keystore, String alias, char[] password) { + try { + // Get private key + Key key = keystore.getKey(alias, password); + if (key instanceof PrivateKey) { + // Get certificate of public key + Certificate cert = keystore.getCertificate(alias); + + // Get public key + PublicKey publicKey = cert.getPublicKey(); + + // Return a key pair + return new KeyPair(publicKey, (PrivateKey)key); + } + } catch (UnrecoverableKeyException e) { + } catch (NoSuchAlgorithmException e) { + } catch (KeyStoreException e) { + } + return null; + } + +} + Index: /tools/routingservice/trunk/security/extractor/README =================================================================== --- /tools/routingservice/trunk/security/extractor/README (revision 252) +++ /tools/routingservice/trunk/security/extractor/README (revision 252) @@ -0,0 +1,1 @@ +java ExportPriv > exported-pkcs8.key Index: /tools/routingservice/trunk/security/README =================================================================== --- /tools/routingservice/trunk/security/README (revision 252) +++ /tools/routingservice/trunk/security/README (revision 252) @@ -0,0 +1,18 @@ +1. Creating the keypair +keytool -keystore wrs -export -alias > + +2. Convert to PEM +openssl x509 -out -outform pem -text -in -inform der + +3. Extract public key for encryption +openssl x509 -inform pem -in -pubkey -noout > + +4. Extract private key for signing + !!!MUST BE DELETED AFTER MAKING A SIGNATURE!!! +see extractor/README + +5. Encrypting +more | openssl rsautl -encrypt -inkey standard_pub.pem -pubin | openssl enc -base64 > encrypted_base64 + +6. Signing +more | openssl rsautl -sign -inkey | openssl enc -base64 > signature2_base64