[routino] 02/11: Merge tag 'upstream/3.1'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Mar 6 14:19:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository routino.
commit 7c0db3d01467c334d8a207953dc717585eaef341
Merge: aee3090 7683ba3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 6 14:03:57 2016 +0100
Merge tag 'upstream/3.1'
Upstream version 3.1
ChangeLog | 370 +++++++
Makefile.conf | 24 +-
doc/INSTALL.txt | 14 +-
doc/LIBRARY.txt | 16 +-
doc/NEWS.txt | 43 +
doc/README.txt | 5 +-
doc/html/installation.html | 9 +-
doc/html/library.html | 91 +-
doc/html/readme.html | 69 +-
extras/find-fixme/Makefile | 16 +-
extras/find-fixme/web/www/.htaccess | 32 +
extras/find-fixme/web/www/fixme.html | 4 +-
extras/{tagmodifier => statistics}/Makefile | 49 +-
extras/statistics/README.txt | 22 +
extras/statistics/create-basemap.pl | 93 ++
extras/statistics/create-image.pl | 270 +++++
extras/statistics/dumper.c | 503 +++++++++
extras/statistics/update.sh | 94 ++
extras/tagmodifier/Makefile | 10 +-
src/Makefile | 80 +-
src/optimiser.c | 1278 ++++++++++++++---------
src/output.c | 71 +-
src/profiles.c | 11 +-
src/results.h | 7 +-
src/router+lib.c | 73 +-
src/router.c | 280 ++---
src/routino.c | 64 +-
src/routino.h | 10 +-
src/segments.h | 4 +-
src/test/Makefile | 7 +-
src/test/expected/coincident-waypoint-WP01.txt | 8 +-
src/test/expected/coincident-waypoint-WP02.txt | 8 +-
src/test/expected/coincident-waypoint-WP03.txt | 8 +-
src/test/expected/coincident-waypoint-WP04.txt | 8 +-
src/test/expected/cycle-both-ways-WP01.txt | 4 +-
src/test/expected/cycle-both-ways-WP02.txt | 4 +-
src/test/expected/dead-ends-WP01.txt | 6 +-
src/test/expected/dead-ends-WP02.txt | 6 +-
src/test/expected/dead-ends-WP03.txt | 6 +-
src/test/expected/dead-ends-WP04.txt | 6 +-
src/test/expected/dead-ends-WP05.txt | 6 +-
src/test/expected/dead-ends-WP06.txt | 6 +-
src/test/expected/dead-ends-WP07.txt | 6 +-
src/test/expected/dead-ends-WP08.txt | 6 +-
src/test/expected/dead-ends-WP09.txt | 6 +-
src/test/expected/dead-ends-WP10.txt | 6 +-
src/test/expected/dead-ends-WP11.txt | 6 +-
src/test/expected/fake-node-with-loop-WP01.txt | 6 +-
src/test/expected/fake-node-with-loop-WP02.txt | 6 +-
src/test/expected/loop-and-reverse-WP-L.txt | 14 +
src/test/expected/loop-and-reverse-WP-LR.txt | 14 +
src/test/expected/loop-and-reverse-WP-R.txt | 11 +
src/test/expected/loop-and-reverse-WP.txt | 11 +
src/test/expected/loops-WP01.txt | 6 +-
src/test/expected/loops-WP02.txt | 6 +-
src/test/expected/loops-WP03.txt | 6 +-
src/test/expected/loops-WP04.txt | 6 +-
src/test/expected/loops-WP05.txt | 6 +-
src/test/expected/loops-WP06.txt | 6 +-
src/test/expected/loops-WP07.txt | 6 +-
src/test/expected/loops-WP08.txt | 6 +-
src/test/expected/loops-WP09.txt | 6 +-
src/test/expected/loops-WP10.txt | 6 +-
src/test/expected/loops-WP11.txt | 6 +-
src/test/expected/no-super-WP01.txt | 6 +-
src/test/expected/no-super-WP02.txt | 6 +-
src/test/expected/no-super-WP03.txt | 6 +-
src/test/expected/no-super-WP04.txt | 6 +-
src/test/expected/node-restrictions-WP01.txt | 6 +-
src/test/expected/node-restrictions-WP02.txt | 6 +-
src/test/expected/node-restrictions-WP03.txt | 6 +-
src/test/expected/node-restrictions-WP04.txt | 6 +-
src/test/expected/node-restrictions-WP05.txt | 6 +-
src/test/expected/node-restrictions-WP06.txt | 6 +-
src/test/expected/node-restrictions-WP07.txt | 6 +-
src/test/expected/node-restrictions-WP08.txt | 6 +-
src/test/expected/oneway-loop-WP01.txt | 6 +-
src/test/expected/roundabout-waypoints-WP01.txt | 6 +-
src/test/expected/roundabout-waypoints-WP02.txt | 6 +-
src/test/expected/roundabout-waypoints-WP03.txt | 6 +-
src/test/expected/roundabout-waypoints-WP04.txt | 6 +-
src/test/expected/roundabout-waypoints-WP05.txt | 6 +-
src/test/expected/roundabout-waypoints-WP06.txt | 6 +-
src/test/expected/roundabout-waypoints-WP07.txt | 6 +-
src/test/expected/super-or-not-WP01.txt | 14 +-
src/test/expected/super-or-not-WP02.txt | 8 +-
src/test/expected/super-or-not-WP03.txt | 8 +-
src/test/expected/super-or-not-WP04.txt | 13 +
src/test/expected/super-or-not-WP05.txt | 13 +
src/test/expected/turns-WP01.txt | 6 +-
src/test/expected/turns-WP02.txt | 6 +-
src/test/expected/turns-WP03.txt | 6 +-
src/test/expected/turns-WP04.txt | 6 +-
src/test/expected/turns-WP05.txt | 6 +-
src/test/expected/turns-WP06.txt | 6 +-
src/test/expected/turns-WP07.txt | 6 +-
src/test/expected/turns-WP08.txt | 6 +-
src/test/expected/turns-WP09.txt | 6 +-
src/test/expected/turns-WP10.txt | 6 +-
src/test/expected/turns-WP11.txt | 6 +-
src/test/expected/turns-WP12.txt | 6 +-
src/test/expected/turns-WP13.txt | 6 +-
src/test/expected/turns-WP14.txt | 6 +-
src/test/expected/turns-WP15.txt | 6 +-
src/test/expected/turns-WP16.txt | 6 +-
src/test/loop-and-reverse.osm | 92 ++
src/test/loop-and-reverse.sh | 127 +++
src/test/super-or-not.osm | 88 +-
src/translations.c | 21 +-
src/translations.h | 4 +-
src/typesx.h | 6 +-
src/version.h | 2 +-
src/ways.h | 16 +-
src/xml/Makefile | 12 +-
src/xmlparse.c | 9 +-
web/Makefile | 6 +-
web/translations/router.html | 12 +-
web/translations/translation.de.txt | 30 +-
web/translations/translation.en.txt | 4 +-
web/translations/translation.fr.txt | 78 +-
web/translations/translation.hu.txt | 1 -
web/translations/translation.nl.txt | 5 -
web/translations/translation.pl.txt | 5 -
web/translations/translation.ru.txt | 5 -
web/translations/translations-body.xml | 4 +-
web/www/routino/.htaccess | 25 +-
web/www/routino/icons/waypoint-loop.png | Bin 0 -> 178 bytes
web/www/routino/icons/waypoint-reverse.png | Bin 0 -> 185 bytes
web/www/routino/profiles.js | 2 +-
web/www/routino/profiles.pl | 2 +-
web/www/routino/router.css | 24 +
web/www/routino/router.html.de | 18 +-
web/www/routino/router.html.en | 14 +-
web/www/routino/router.html.fr | 76 +-
web/www/routino/router.html.hu | 14 +-
web/www/routino/router.html.nl | 14 +-
web/www/routino/router.html.pl | 14 +-
web/www/routino/router.html.ru | 14 +-
web/www/routino/router.leaflet.js | 77 +-
web/www/routino/router.openlayers.js | 75 +-
web/www/routino/router.pl | 8 +-
web/www/routino/visualiser.html.de | 44 +-
web/www/routino/visualiser.html.en | 2 +-
web/www/routino/visualiser.html.fr | 34 +-
web/www/routino/visualiser.html.hu | 2 +-
web/www/routino/visualiser.html.nl | 2 +-
web/www/routino/visualiser.html.pl | 2 +-
web/www/routino/visualiser.html.ru | 2 +-
xml/routino-profiles.xml | 14 +-
xml/routino-translations.xml | 52 +-
150 files changed, 3777 insertions(+), 1406 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git
More information about the Pkg-grass-devel
mailing list