[routino] 05/13: Merge tag 'upstream/2.7'
Uwe Steinmann
steinm-guest at moszumanska.debian.org
Thu Apr 17 11:40:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
steinm-guest pushed a commit to branch master
in repository routino.
commit ff97bf88228d6678c4c3f114da390fe2a3b2ddae
Merge: 4f810a1 2e74f67
Author: Uwe Steinmann <steinm at debian.org>
Date: Thu Apr 17 07:35:05 2014 +0200
Merge tag 'upstream/2.7'
Upstream version 2.7
ChangeLog | 1965 ++++++++++++++++++++
Makefile | 36 +-
Makefile.conf | 81 +
doc/ALGORITHM.txt | 53 +-
doc/CONFIGURATION.txt | 76 +-
doc/DATALIFE.txt | 77 +-
doc/INSTALL.txt | 211 ++-
doc/LIMITS.txt | 167 ++
doc/Makefile | 59 +-
doc/NEWS.txt | 157 +-
doc/README.txt | 45 +-
doc/TAGGING.txt | 161 +-
doc/USAGE.txt | 162 +-
doc/html/algorithm.html | 113 +-
doc/html/configuration.html | 122 +-
doc/html/data.html | 42 +-
doc/html/index.html | 51 +-
doc/html/installation.html | 289 ++-
doc/html/limits.html | 244 +++
doc/html/output.html | 42 +-
doc/html/readme.html | 171 +-
doc/html/style.css | 34 +-
doc/html/tagging.html | 252 +--
doc/html/usage.html | 185 +-
Makefile => extras/Makefile | 38 +-
extras/README.txt | 27 +
extras/errorlog/README.txt | 29 +
{web/bin => extras/errorlog}/summarise-log.pl | 144 +-
extras/find-fixme/Makefile | 175 ++
extras/find-fixme/README.txt | 96 +
extras/find-fixme/fixme-dumper.c | 346 ++++
extras/find-fixme/fixme-finder.c | 365 ++++
extras/find-fixme/fixme.xml | 74 +
extras/find-fixme/osmparser.c | 314 ++++
extras/find-fixme/web/www/fixme.cgi | 147 ++
.../find-fixme/web/www/fixme.css | 30 +-
extras/find-fixme/web/www/fixme.html | 162 ++
extras/find-fixme/web/www/fixme.leaflet.js | 563 ++++++
extras/find-fixme/web/www/fixme.openlayers.js | 623 +++++++
.../find-fixme/web/www}/index.html | 38 +-
.../find-fixme/web/www/paths.pl | 28 +-
extras/plot-time/README.txt | 18 +
extras/plot-time/plot-planetsplitter-time.pl | 108 ++
extras/tagmodifier/Makefile | 84 +
extras/tagmodifier/README.txt | 42 +
{src => extras/tagmodifier}/tagmodifier.c | 254 +--
src/Makefile | 133 +-
src/cache.h | 180 ++
src/errorlog.c | 178 ++
src/errorlog.h | 195 ++
src/errorlogx.c | 980 ++++++++++
src/errorlogx.h | 70 +
src/fakes.c | 16 +-
src/filedumper.c | 391 +++-
src/filedumperx.c | 173 +-
src/files.c | 429 ++++-
src/files.h | 130 +-
src/functions.h | 6 +-
src/logerror.c | 219 +++
src/logging.c | 102 +-
src/logging.h | 35 +-
src/nodes.c | 151 +-
src/nodes.h | 35 +-
src/nodesx.c | 196 +-
src/nodesx.h | 36 +-
src/optimiser.c | 733 ++++++--
src/osmo5mparse.c | 856 +++++++++
src/osmparser.c | 1123 ++++-------
src/osmparser.h | 43 +-
src/osmpbfparse.c | 1234 ++++++++++++
src/osmxmlparse.c | 703 +++++++
src/output.c | 188 +-
src/planetsplitter.c | 359 ++--
src/profiles.c | 443 ++---
src/prunex.c | 281 +--
src/queue.c | 113 +-
src/relations.c | 57 +-
src/relations.h | 33 +-
src/relationsx.c | 558 +++---
src/relationsx.h | 36 +-
src/results.c | 207 +--
src/results.h | 29 +-
src/router.c | 444 +++--
src/segments.c | 59 +-
src/segments.h | 35 +-
src/segmentsx.c | 527 ++----
src/segmentsx.h | 62 +-
src/sorting.c | 120 +-
src/superx.c | 160 +-
src/tagging.c | 662 ++++---
src/tagging.h | 52 +-
src/test/Makefile | 44 +-
src/test/a-b-c.sh | 7 +-
src/test/a-b.sh | 7 +-
src/test/dead-ends.osm | 4 +-
src/test/expected/dead-ends-WP01.txt | 10 +-
src/test/expected/dead-ends-WP02.txt | 14 +-
src/test/expected/dead-ends-WP03.txt | 16 +-
src/test/expected/dead-ends-WP04.txt | 22 +-
src/test/expected/dead-ends-WP05.txt | 12 +-
src/test/expected/dead-ends-WP06.txt | 16 +-
src/test/expected/dead-ends-WP07.txt | 18 +-
src/test/expected/dead-ends-WP08.txt | 12 +-
src/test/expected/dead-ends-WP09.txt | 16 +-
src/test/expected/dead-ends-WP10.txt | 18 +-
src/test/expected/dead-ends-WP11.txt | 24 +-
src/test/expected/node-restrictions-WP08.txt | 26 +-
src/test/is-fast-math.c | 20 +
src/test/node-restrictions.osm | 2 +-
src/test/oneway-loop.osm | 2 +-
src/test/only-split.sh | 9 +-
src/test/prune-short.osm | 629 +++++++
src/test/prune-short.sh | 1 +
src/test/prune-straight.osm | 167 ++
src/test/prune-straight.sh | 1 +
src/test/start-1-finish.sh | 7 +-
src/test/waypoints.pl | 32 +-
src/translations.c | 742 ++++----
src/types.c | 28 +-
src/types.h | 65 +-
src/uncompress.c | 450 +++++
src/{osmparser.h => uncompress.h} | 22 +-
src/visualiser.c | 211 ++-
src/visualiser.h | 7 +-
src/ways.c | 40 +-
src/ways.h | 50 +-
src/waysx.c | 411 ++--
src/waysx.h | 43 +-
src/xml/Makefile | 24 +-
src/xml/xsd-to-xmlparser.c | 269 ++-
src/xmlparse.c | 1706 +++++++++++++++++
src/xmlparse.h | 21 +-
src/xmlparse.l | 931 ----------
web/Makefile | 149 ++
web/data/create.sh | 24 +-
web/translations/router.html | 396 ++++
web/translations/translate.pl | 327 ++++
web/translations/translation.de.txt | 204 ++
web/translations/translation.en.txt | 390 ++++
web/translations/translation.fr.txt | 240 +++
web/translations/translation.nl.txt | 206 ++
web/translations/visualiser.html | 424 +++++
web/www/leaflet/install.sh | 11 +
web/www/openlayers/install.sh | 2 +-
web/www/openlayers/routino.cfg | 2 +
web/www/routino/icons/waypoint-left.png | Bin 0 -> 164 bytes
web/www/routino/icons/waypoint-right.png | Bin 0 -> 153 bytes
web/www/routino/index.html | 32 +-
web/www/routino/maplayout-ie6-bugfixes.css | 83 -
web/www/routino/maplayout-ie7-bugfixes.css | 64 -
web/www/routino/maplayout.css | 12 +-
web/www/routino/maploader.js | 63 +
web/www/routino/mapprops.js | 83 +-
web/www/routino/page-elements.css | 16 +-
web/www/routino/page-elements.js | 17 +-
web/www/routino/results.cgi | 18 +-
web/www/routino/router.cgi | 26 +-
web/www/routino/router.css | 12 +-
web/www/routino/router.html.de | 904 +++++----
web/www/routino/router.html.en | 926 +++++----
web/www/routino/router.html.fr | 493 +++++
web/www/routino/router.html.nl | 927 +++++----
web/www/routino/{router.js => router.leaflet.js} | 745 +++++---
.../routino/{router.js => router.openlayers.js} | 583 ++++--
web/www/routino/router.pl | 50 +-
web/www/routino/search.cgi | 36 +-
web/www/routino/search.pl | 35 +-
web/www/routino/statistics.cgi | 12 +-
web/www/routino/update-profiles.pl | 14 +-
web/www/routino/visualiser.cgi | 140 +-
web/www/routino/visualiser.css | 18 +-
web/www/routino/visualiser.html.de | 458 +++++
web/www/routino/visualiser.html.en | 788 ++++----
web/www/routino/visualiser.html.fr | 458 +++++
web/www/routino/visualiser.html.nl | 458 +++++
web/www/routino/visualiser.js | 920 ---------
web/www/routino/visualiser.leaflet.js | 1226 ++++++++++++
web/www/routino/visualiser.openlayers.js | 1309 +++++++++++++
xml/Makefile | 51 +-
xml/routino-profiles.xml | 134 +-
xml/routino-tagging.xml | 1559 +++++++++-------
xml/routino-tagging.xsd | 31 +-
xml/routino-translations.xml | 157 +-
xml/routino-translations.xsd | 6 +-
xml/scripts/drive.pl | 24 +
xml/scripts/ride.pl | 26 +-
xml/scripts/walk.pl | 26 +-
187 files changed, 31981 insertions(+), 10762 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