Commit 186bad4c authored by Jean-Benoist Leger's avatar Jean-Benoist Leger

frontend update

parent efba60ef
AUTOMAKE_OPTIONS = foreign
SUBDIRS = route height sql doc utils
SUBDIRS = route height sql doc utils herve
......@@ -35,4 +35,5 @@ AC_OUTPUT([Makefile
route/Makefile
sql/Makefile
doc/Makefile
utils/Makefile])
utils/Makefile
herve/Makefile])
......@@ -38,7 +38,7 @@ function load_map() {
var osmfrUrl = 'http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png';
var osmfr = new L.TileLayer(osmfrUrl, {maxZoom: 18, attribution: osmAttribution});
herve.map.setView(new L.LatLng(40.845165, -77.483849), 8);
herve.map.setView(new L.LatLng(47, 3), 6);
var baseLayers = {
"OpenStreetMap": osm,
......@@ -513,9 +513,9 @@ function showLinks()
function showGpx()
{
txt='<ul>'
+'<li><a href="/py/getGPX.py?jid=' + herve.jid + '&minimal=0&step=0&nptsmax=0">GPX avec tous les pts</a></li>'
+'<li><a href="/py/getGPX.py?jid=' + herve.jid + '&minimal=1&step=0&nptsmax=0">GPX avec uniquement les pts d\'itersection</a></li>'
+'<li><a href="/py/getGPX.py?jid=' + herve.jid + '&minimal=0&step=200&nptsmax=50">GPX pour Garmin (50 pt max)</a></li>'
+'<li><a href="py/getGPX.py?jid=' + herve.jid + '&minimal=0&step=0&nptsmax=0">GPX avec tous les pts</a></li>'
+'<li><a href="py/getGPX.py?jid=' + herve.jid + '&minimal=1&step=0&nptsmax=0">GPX avec uniquement les pts d\'itersection</a></li>'
+'<li><a href="py/getGPX.py?jid=' + herve.jid + '&minimal=0&step=200&nptsmax=50">GPX pour Garmin (50 pt max)</a></li>'
+'</ul>'
+'<p><a href="#" onclick="showLinks(); return false;">Retour</a></p>'
+'<hr />';
......
../images
\ No newline at end of file
......@@ -111,7 +111,7 @@ print json.dumps({'jid':jid})
sys.stdout.flush()
subprocess.Popen(["/sbin/start-stop-daemon",'-S','-b','-p','/tmp/does-not-exists','--exec',"/home/rv/rv/route/rv_route",'--', dbstr, ("%d"%jid)])
subprocess.Popen(["/sbin/start-stop-daemon",'-S','-b','-p','/tmp/does-not-exists','--exec',rv_route,'--', dbstr, ("%d"%jid)])
......@@ -27,8 +27,8 @@ class database
pqxx::connection dbw;
database(const std::string & s_filename,unsigned int jid_i) : db(s_filename),txn(db),dbw(s_filename),jid(jid_i) {
db.prepare("get_node","SELECT ST_X(geom),ST_Y(geom),height FROM rv_nodes WHERE id=$1;");
db.prepare("get_adj","SELECT to_id FROM rv_edges WHERE from_id=$1;");
db.prepare("get_node","SELECT ST_X(geom),ST_Y(geom),height FROM rv_nodes WHERE id=$1;")("bigint");
db.prepare("get_adj","SELECT to_id FROM rv_edges WHERE from_id=$1;")("bigint");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment