[qmapshack] 02/06: Merge tag 'upstream/1.3.0'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jun 30 19:20:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit aa4027d654fbb6a2cfd958c528dfe49859b0f5be
Merge: 195c8ac 2cc8299
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jun 29 22:44:31 2015 +0200
Merge tag 'upstream/1.3.0'
Upstream version 1.3.0
.hgsub | 1 +
.hgsubstate | 1 +
3rdparty/Routino/FILES | 18 +
3rdparty/Routino/INSTALL.txt | 1 +
3rdparty/Routino/Makefile | 67 +
3rdparty/Routino/Makefile.conf | 90 +
3rdparty/Routino/NEWS.txt | 1 +
3rdparty/Routino/README.txt | 1 +
3rdparty/Routino/agpl-3.0.txt | 661 ++++++
3rdparty/Routino/doc/ALGORITHM.txt | 371 ++++
3rdparty/Routino/doc/CONFIGURATION.txt | 219 ++
3rdparty/Routino/doc/DATA.txt | 116 +
3rdparty/Routino/doc/DATALIFE.txt | 106 +
3rdparty/Routino/doc/INSTALL-MS-WIN.txt | 138 ++
3rdparty/Routino/doc/INSTALL.txt | 312 +++
3rdparty/Routino/doc/LIMITS.txt | 167 ++
3rdparty/Routino/doc/Makefile | 75 +
3rdparty/Routino/doc/NEWS.txt | 824 +++++++
3rdparty/Routino/doc/OUTPUT.txt | 293 +++
3rdparty/Routino/doc/README.txt | 188 ++
3rdparty/Routino/doc/TAGGING.txt | 556 +++++
3rdparty/Routino/doc/USAGE.txt | 648 ++++++
3rdparty/Routino/doc/html/algorithm.html | 413 ++++
3rdparty/Routino/doc/html/configuration.html | 314 +++
3rdparty/Routino/doc/html/data.html | 166 ++
3rdparty/Routino/doc/html/example0.png | Bin 0 -> 119726 bytes
3rdparty/Routino/doc/html/example1.png | Bin 0 -> 136817 bytes
3rdparty/Routino/doc/html/example2.png | Bin 0 -> 95408 bytes
3rdparty/Routino/doc/html/example3.png | Bin 0 -> 82532 bytes
3rdparty/Routino/doc/html/example4.png | Bin 0 -> 67635 bytes
3rdparty/Routino/doc/html/index.html | 139 ++
.../Routino/doc/html/installation-ms-windows.html | 229 ++
3rdparty/Routino/doc/html/installation.html | 433 ++++
3rdparty/Routino/doc/html/limits.html | 243 +++
3rdparty/Routino/doc/html/output.html | 409 ++++
3rdparty/Routino/doc/html/readme.html | 425 ++++
3rdparty/Routino/doc/html/style.css | 435 ++++
3rdparty/Routino/doc/html/tagging.html | 988 +++++++++
3rdparty/Routino/doc/html/usage.html | 625 ++++++
3rdparty/Routino/extras/Makefile | 67 +
3rdparty/Routino/extras/README.txt | 27 +
3rdparty/Routino/extras/errorlog/README.txt | 29 +
3rdparty/Routino/extras/errorlog/summarise-log.pl | 295 +++
3rdparty/Routino/extras/find-fixme/Makefile | 191 ++
3rdparty/Routino/extras/find-fixme/README.txt | 97 +
3rdparty/Routino/extras/find-fixme/fixme-dumper.c | 345 +++
3rdparty/Routino/extras/find-fixme/fixme-finder.c | 369 ++++
3rdparty/Routino/extras/find-fixme/fixme.xml | 74 +
3rdparty/Routino/extras/find-fixme/osmparser.c | 306 +++
.../Routino/extras/find-fixme/web/www/fixme.cgi | 147 ++
.../Routino/extras/find-fixme/web/www/fixme.css | 86 +
.../Routino/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 ++++++
.../Routino/extras/find-fixme/web/www/index.html | 71 +
.../Routino/extras/find-fixme/web/www/paths.pl | 34 +
3rdparty/Routino/extras/plot-time/README.txt | 18 +
.../extras/plot-time/plot-planetsplitter-time.pl | 108 +
3rdparty/Routino/extras/tagmodifier/Makefile | 88 +
3rdparty/Routino/extras/tagmodifier/README.txt | 45 +
3rdparty/Routino/extras/tagmodifier/tagmodifier.c | 723 +++++++
3rdparty/Routino/src/Makefile | 274 +++
3rdparty/Routino/src/cache.h | 179 ++
3rdparty/Routino/src/errorlog.c | 178 ++
3rdparty/Routino/src/errorlog.h | 195 ++
3rdparty/Routino/src/errorlogx.c | 981 +++++++++
3rdparty/Routino/src/errorlogx.h | 70 +
3rdparty/Routino/src/fakes.c | 415 ++++
3rdparty/Routino/src/fakes.h | 58 +
3rdparty/Routino/src/filedumper.c | 1278 +++++++++++
3rdparty/Routino/src/filedumperx.c | 330 +++
3rdparty/Routino/src/files.c | 1081 ++++++++++
3rdparty/Routino/src/files.h | 173 ++
3rdparty/Routino/src/functions.h | 52 +
3rdparty/Routino/src/logerror.c | 223 ++
3rdparty/Routino/src/logging.c | 607 ++++++
3rdparty/Routino/src/logging.h | 114 +
3rdparty/Routino/src/mman-win32.c | 206 ++
3rdparty/Routino/src/mman-win32.h | 77 +
3rdparty/Routino/src/nodes.c | 624 ++++++
3rdparty/Routino/src/nodes.h | 175 ++
3rdparty/Routino/src/nodesx.c | 900 ++++++++
3rdparty/Routino/src/nodesx.h | 186 ++
3rdparty/Routino/src/optimiser.c | 1815 ++++++++++++++++
3rdparty/Routino/src/osmo5mparse.c | 861 ++++++++
3rdparty/Routino/src/osmparser.c | 1192 ++++++++++
3rdparty/Routino/src/osmparser.h | 73 +
3rdparty/Routino/src/osmpbfparse.c | 1243 +++++++++++
3rdparty/Routino/src/osmxmlparse.c | 711 ++++++
3rdparty/Routino/src/output.c | 954 ++++++++
3rdparty/Routino/src/planetsplitter.c | 731 +++++++
3rdparty/Routino/src/profiles.c | 1119 ++++++++++
3rdparty/Routino/src/profiles.h | 80 +
3rdparty/Routino/src/prunex.c | 1497 +++++++++++++
3rdparty/Routino/src/prunex.h | 43 +
3rdparty/Routino/src/queue.c | 225 ++
3rdparty/Routino/src/relations.c | 405 ++++
3rdparty/Routino/src/relations.h | 151 ++
3rdparty/Routino/src/relationsx.c | 1460 +++++++++++++
3rdparty/Routino/src/relationsx.h | 120 ++
3rdparty/Routino/src/results.c | 334 +++
3rdparty/Routino/src/results.h | 122 ++
3rdparty/Routino/src/router.c | 955 ++++++++
3rdparty/Routino/src/routino.c | 26 +
3rdparty/Routino/src/routino.h | 74 +
3rdparty/Routino/src/segments.c | 437 ++++
3rdparty/Routino/src/segments.h | 279 +++
3rdparty/Routino/src/segmentsx.c | 1003 +++++++++
3rdparty/Routino/src/segmentsx.h | 228 ++
3rdparty/Routino/src/sorting.c | 1078 ++++++++++
3rdparty/Routino/src/sorting.h | 59 +
3rdparty/Routino/src/superx.c | 588 +++++
3rdparty/Routino/src/superx.h | 38 +
3rdparty/Routino/src/tagging.c | 980 +++++++++
3rdparty/Routino/src/tagging.h | 85 +
3rdparty/Routino/src/test/Makefile | 121 ++
3rdparty/Routino/src/test/a-b-c-d.sh | 105 +
3rdparty/Routino/src/test/a-b-c.sh | 104 +
3rdparty/Routino/src/test/a-b.sh | 103 +
3rdparty/Routino/src/test/coincident-waypoint.osm | 101 +
3rdparty/Routino/src/test/coincident-waypoint.sh | 1 +
3rdparty/Routino/src/test/copyright.xml | 30 +
3rdparty/Routino/src/test/cycle-both-ways.osm | 107 +
3rdparty/Routino/src/test/cycle-both-ways.sh | 1 +
3rdparty/Routino/src/test/cycle-drive.sh | 105 +
3rdparty/Routino/src/test/dead-ends.osm | 176 ++
3rdparty/Routino/src/test/dead-ends.sh | 1 +
.../src/test/expected/coincident-waypoint-WP01.txt | 12 +
.../src/test/expected/coincident-waypoint-WP02.txt | 11 +
.../src/test/expected/coincident-waypoint-WP03.txt | 12 +
.../src/test/expected/coincident-waypoint-WP04.txt | 10 +
.../src/test/expected/cycle-both-ways-WP01.txt | 16 +
.../src/test/expected/cycle-both-ways-WP02.txt | 16 +
.../Routino/src/test/expected/dead-ends-WP01.txt | 17 +
.../Routino/src/test/expected/dead-ends-WP02.txt | 19 +
.../Routino/src/test/expected/dead-ends-WP03.txt | 21 +
.../Routino/src/test/expected/dead-ends-WP04.txt | 23 +
.../Routino/src/test/expected/dead-ends-WP05.txt | 17 +
.../Routino/src/test/expected/dead-ends-WP06.txt | 19 +
.../Routino/src/test/expected/dead-ends-WP07.txt | 21 +
.../Routino/src/test/expected/dead-ends-WP08.txt | 17 +
.../Routino/src/test/expected/dead-ends-WP09.txt | 19 +
.../Routino/src/test/expected/dead-ends-WP10.txt | 21 +
.../Routino/src/test/expected/dead-ends-WP11.txt | 23 +
.../src/test/expected/fake-node-with-loop-WP01.txt | 19 +
.../src/test/expected/fake-node-with-loop-WP02.txt | 18 +
3rdparty/Routino/src/test/expected/loops-WP01.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP02.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP03.txt | 25 +
3rdparty/Routino/src/test/expected/loops-WP04.txt | 25 +
3rdparty/Routino/src/test/expected/loops-WP05.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP06.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP07.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP08.txt | 25 +
3rdparty/Routino/src/test/expected/loops-WP09.txt | 25 +
3rdparty/Routino/src/test/expected/loops-WP10.txt | 24 +
3rdparty/Routino/src/test/expected/loops-WP11.txt | 24 +
.../Routino/src/test/expected/no-super-WP01.txt | 16 +
.../Routino/src/test/expected/no-super-WP02.txt | 9 +
.../Routino/src/test/expected/no-super-WP03.txt | 13 +
.../Routino/src/test/expected/no-super-WP04.txt | 17 +
.../src/test/expected/node-restrictions-WP01.txt | 24 +
.../src/test/expected/node-restrictions-WP02.txt | 24 +
.../src/test/expected/node-restrictions-WP03.txt | 24 +
.../src/test/expected/node-restrictions-WP04.txt | 24 +
.../src/test/expected/node-restrictions-WP05.txt | 24 +
.../src/test/expected/node-restrictions-WP06.txt | 24 +
.../src/test/expected/node-restrictions-WP07.txt | 22 +
.../src/test/expected/node-restrictions-WP08.txt | 22 +
.../Routino/src/test/expected/oneway-loop-WP01.txt | 17 +
.../test/expected/roundabout-waypoints-WP01.txt | 12 +
.../test/expected/roundabout-waypoints-WP02.txt | 13 +
.../test/expected/roundabout-waypoints-WP03.txt | 12 +
.../test/expected/roundabout-waypoints-WP04.txt | 13 +
.../test/expected/roundabout-waypoints-WP05.txt | 12 +
.../test/expected/roundabout-waypoints-WP06.txt | 13 +
.../test/expected/roundabout-waypoints-WP07.txt | 12 +
.../src/test/expected/super-or-not-WP01.txt | 13 +
.../src/test/expected/super-or-not-WP02.txt | 10 +
.../src/test/expected/super-or-not-WP03.txt | 10 +
3rdparty/Routino/src/test/expected/turns-WP01.txt | 19 +
3rdparty/Routino/src/test/expected/turns-WP02.txt | 18 +
3rdparty/Routino/src/test/expected/turns-WP03.txt | 18 +
3rdparty/Routino/src/test/expected/turns-WP04.txt | 27 +
3rdparty/Routino/src/test/expected/turns-WP05.txt | 26 +
3rdparty/Routino/src/test/expected/turns-WP06.txt | 26 +
3rdparty/Routino/src/test/expected/turns-WP07.txt | 34 +
3rdparty/Routino/src/test/expected/turns-WP08.txt | 31 +
3rdparty/Routino/src/test/expected/turns-WP09.txt | 31 +
3rdparty/Routino/src/test/expected/turns-WP10.txt | 35 +
3rdparty/Routino/src/test/expected/turns-WP11.txt | 32 +
3rdparty/Routino/src/test/expected/turns-WP12.txt | 32 +
3rdparty/Routino/src/test/expected/turns-WP13.txt | 45 +
3rdparty/Routino/src/test/expected/turns-WP14.txt | 44 +
3rdparty/Routino/src/test/expected/turns-WP15.txt | 44 +
3rdparty/Routino/src/test/expected/turns-WP16.txt | 16 +
3rdparty/Routino/src/test/fake-node-with-loop.osm | 102 +
3rdparty/Routino/src/test/fake-node-with-loop.sh | 1 +
.../Routino/src/test/invalid-turn-relations.osm | 230 ++
.../Routino/src/test/invalid-turn-relations.sh | 1 +
3rdparty/Routino/src/test/is-fast-math.c | 20 +
3rdparty/Routino/src/test/loops.osm | 168 ++
3rdparty/Routino/src/test/loops.sh | 1 +
3rdparty/Routino/src/test/no-super.osm | 105 +
3rdparty/Routino/src/test/no-super.sh | 1 +
3rdparty/Routino/src/test/node-restrictions.osm | 176 ++
3rdparty/Routino/src/test/node-restrictions.sh | 1 +
3rdparty/Routino/src/test/oneway-loop.osm | 99 +
3rdparty/Routino/src/test/oneway-loop.sh | 1 +
3rdparty/Routino/src/test/only-split.sh | 75 +
3rdparty/Routino/src/test/prune-short.osm | 629 ++++++
3rdparty/Routino/src/test/prune-short.sh | 1 +
3rdparty/Routino/src/test/prune-straight.osm | 167 ++
3rdparty/Routino/src/test/prune-straight.sh | 1 +
3rdparty/Routino/src/test/roundabout-waypoints.osm | 105 +
3rdparty/Routino/src/test/roundabout-waypoints.sh | 1 +
3rdparty/Routino/src/test/start-1-finish.sh | 103 +
3rdparty/Routino/src/test/super-or-not.osm | 55 +
3rdparty/Routino/src/test/super-or-not.sh | 1 +
3rdparty/Routino/src/test/turns.osm | 456 ++++
3rdparty/Routino/src/test/turns.sh | 1 +
3rdparty/Routino/src/test/waypoints.pl | 78 +
3rdparty/Routino/src/translations.c | 1351 ++++++++++++
3rdparty/Routino/src/translations.h | 87 +
3rdparty/Routino/src/types.c | 616 ++++++
3rdparty/Routino/src/types.h | 460 ++++
3rdparty/Routino/src/typesx.h | 125 ++
3rdparty/Routino/src/uncompress.c | 473 ++++
3rdparty/Routino/src/uncompress.h | 32 +
3rdparty/Routino/src/visualiser.c | 1154 ++++++++++
3rdparty/Routino/src/visualiser.h | 59 +
3rdparty/Routino/src/ways.c | 148 ++
3rdparty/Routino/src/ways.h | 196 ++
3rdparty/Routino/src/waysx.c | 898 ++++++++
3rdparty/Routino/src/waysx.h | 183 ++
3rdparty/Routino/src/xml/Makefile | 119 +
.../Routino/src/xml/test/bad-attr-entity-ref.xml | 12 +
.../src/xml/test/bad-comment-ends-triple-dash.xml | 12 +
.../src/xml/test/bad-comment-extra-double-dash.xml | 12 +
.../src/xml/test/bad-double-quote-attr-amp.xml | 12 +
.../test/bad-double-quote-attr-invalid-ascii.xml | 12 +
.../test/bad-double-quote-attr-invalid-utf8.xml | 12 +
.../xml/test/bad-double-quote-attr-left-angle.xml | 12 +
.../xml/test/bad-double-quote-attr-right-angle.xml | 12 +
.../Routino/src/xml/test/bad-early-end-of-file.xml | 11 +
.../src/xml/test/bad-end-tag-space-at-begin1.xml | 12 +
.../src/xml/test/bad-end-tag-space-at-begin2.xml | 12 +
.../src/xml/test/bad-end-tag-space-at-end.xml | 12 +
.../Routino/src/xml/test/bad-end-tag-with-attr.xml | 12 +
.../src/xml/test/bad-single-quote-attr-amp.xml | 12 +
.../test/bad-single-quote-attr-invalid-ascii.xml | 12 +
.../test/bad-single-quote-attr-invalid-utf8.xml | 12 +
.../xml/test/bad-single-quote-attr-left-angle.xml | 12 +
.../xml/test/bad-single-quote-attr-right-angle.xml | 12 +
.../src/xml/test/bad-start-tag-space-at-begin.xml | 12 +
.../src/xml/test/bad-tag-attr-no-quotes.xml | 12 +
.../xml/test/bad-tag-attr-space-after-equal.xml | 12 +
.../xml/test/bad-tag-attr-space-before-equal.xml | 12 +
.../Routino/src/xml/test/bad-tag-level-nesting.xml | 12 +
3rdparty/Routino/src/xml/test/bad-text-outside.xml | 13 +
.../src/xml/test/bad-unbalanced-tag-start-end.xml | 12 +
.../src/xml/test/bad-unexpected-attribute-name.xml | 12 +
.../src/xml/test/bad-unexpected-end-tag.xml | 12 +
.../src/xml/test/bad-unexpected-left-angle.xml | 13 +
.../src/xml/test/bad-unexpected-right-angle.xml | 13 +
.../src/xml/test/bad-xml-header-at-begin.xml | 12 +
.../Routino/src/xml/test/bad-xml-header-at-end.xml | 12 +
.../src/xml/test/bad-xml-header-not-first.xml | 12 +
3rdparty/Routino/src/xml/test/good.xml | 12 +
3rdparty/Routino/src/xml/test/test.xsd | 39 +
3rdparty/Routino/src/xml/xsd-to-xmlparser.c | 515 +++++
3rdparty/Routino/src/xmlparse.c | 1788 +++++++++++++++
3rdparty/Routino/src/xmlparse.h | 138 ++
3rdparty/Routino/web/INSTALL.txt | 1 +
3rdparty/Routino/web/Makefile | 232 ++
3rdparty/Routino/web/data/create.sh | 20 +
3rdparty/Routino/web/translations/router.html | 390 ++++
3rdparty/Routino/web/translations/translate.pl | 404 ++++
.../Routino/web/translations/translation.de.txt | 359 +++
.../Routino/web/translations/translation.en.txt | 477 ++++
.../Routino/web/translations/translation.fr.txt | 324 +++
.../Routino/web/translations/translation.hu.txt | 276 +++
.../Routino/web/translations/translation.nl.txt | 309 +++
.../Routino/web/translations/translation.ru.txt | 168 ++
.../Routino/web/translations/translations-body.xml | 93 +
.../Routino/web/translations/translations-head.xml | 18 +
.../Routino/web/translations/translations-tail.xml | 1 +
3rdparty/Routino/web/translations/visualiser.html | 430 ++++
3rdparty/Routino/web/www/leaflet/install.sh | 11 +
3rdparty/Routino/web/www/openlayers/install.sh | 25 +
3rdparty/Routino/web/www/openlayers/routino.cfg | 45 +
3rdparty/Routino/web/www/routino/.htaccess | 40 +
.../Routino/web/www/routino/icons/create-icons.pl | 179 ++
3rdparty/Routino/web/www/routino/icons/home.png | Bin 0 -> 233 bytes
.../Routino/web/www/routino/icons/waypoint-add.png | Bin 0 -> 177 bytes
.../web/www/routino/icons/waypoint-centre.png | Bin 0 -> 142 bytes
.../web/www/routino/icons/waypoint-coords.png | Bin 0 -> 162 bytes
.../web/www/routino/icons/waypoint-down.png | Bin 0 -> 200 bytes
.../web/www/routino/icons/waypoint-home.png | Bin 0 -> 185 bytes
.../web/www/routino/icons/waypoint-left.png | Bin 0 -> 164 bytes
.../web/www/routino/icons/waypoint-locate.png | Bin 0 -> 541 bytes
.../web/www/routino/icons/waypoint-recentre.png | Bin 0 -> 146 bytes
.../web/www/routino/icons/waypoint-remove.png | Bin 0 -> 229 bytes
.../web/www/routino/icons/waypoint-right.png | Bin 0 -> 153 bytes
.../web/www/routino/icons/waypoint-search.png | Bin 0 -> 249 bytes
.../Routino/web/www/routino/icons/waypoint-up.png | Bin 0 -> 241 bytes
3rdparty/Routino/web/www/routino/index.html | 71 +
3rdparty/Routino/web/www/routino/maplayout.css | 111 +
3rdparty/Routino/web/www/routino/maploader.js | 63 +
3rdparty/Routino/web/www/routino/mapprops.js | 83 +
3rdparty/Routino/web/www/routino/page-elements.css | 152 ++
3rdparty/Routino/web/www/routino/page-elements.js | 94 +
3rdparty/Routino/web/www/routino/paths.pl | 43 +
3rdparty/Routino/web/www/routino/results.cgi | 76 +
3rdparty/Routino/web/www/routino/router.cgi | 118 +
3rdparty/Routino/web/www/routino/router.css | 237 ++
3rdparty/Routino/web/www/routino/router.leaflet.js | 2230 +++++++++++++++++++
.../Routino/web/www/routino/router.openlayers.js | 2275 ++++++++++++++++++++
3rdparty/Routino/web/www/routino/router.pl | 211 ++
3rdparty/Routino/web/www/routino/search.cgi | 96 +
3rdparty/Routino/web/www/routino/search.pl | 123 ++
3rdparty/Routino/web/www/routino/statistics.cgi | 44 +
.../Routino/web/www/routino/update-profiles.pl | 79 +
3rdparty/Routino/web/www/routino/visualiser.cgi | 157 ++
3rdparty/Routino/web/www/routino/visualiser.css | 86 +
.../Routino/web/www/routino/visualiser.leaflet.js | 1232 +++++++++++
.../web/www/routino/visualiser.openlayers.js | 1315 +++++++++++
3rdparty/Routino/xml/Makefile | 79 +
3rdparty/Routino/xml/osc.xsd | 133 ++
3rdparty/Routino/xml/osm.xsd | 131 ++
3rdparty/Routino/xml/routino-osc.xsd | 142 ++
3rdparty/Routino/xml/routino-osm.xsd | 143 ++
3rdparty/Routino/xml/routino-profiles.xml | 509 +++++
3rdparty/Routino/xml/routino-profiles.xsd | 111 +
3rdparty/Routino/xml/routino-tagging-nomodify.xml | 57 +
3rdparty/Routino/xml/routino-tagging.xml | 1025 +++++++++
3rdparty/Routino/xml/routino-tagging.xsd | 101 +
3rdparty/Routino/xml/routino-translations.xml | 577 +++++
3rdparty/Routino/xml/routino-translations.xsd | 181 ++
3rdparty/Routino/xml/scripts/drive.pl | 60 +
3rdparty/Routino/xml/scripts/ride.pl | 62 +
3rdparty/Routino/xml/scripts/walk.pl | 67 +
3rdparty/Routino/xml/xsd.xsd | 65 +
3rdparty/RoutinoLib/CMakeLists.txt | 186 ++
3rdparty/RoutinoLib/binout.c | 570 +++++
src/gis/IGisLine.h => 3rdparty/RoutinoLib/binout.h | 23 +-
3rdparty/RoutinoLib/routino.c | 426 ++++
3rdparty/RoutinoLib/routino.h | 130 ++
CMakeLists.txt | 20 +-
CMakeLists.txt.user | 108 +-
CMakeLists.txt.user.3.3-pre1 | 188 --
changelog.txt | 20 +
mkfile | 2 +
src/CMainWindow.cpp | 77 +-
src/CMainWindow.h | 4 +
src/CMakeLists.txt | 102 +-
src/GeoMath.cpp | 32 +-
src/IMainWindow.ui | 64 +
src/canvas/CCanvas.cpp | 33 +-
src/canvas/CCanvas.h | 16 +-
src/canvas/IDrawContext.cpp | 10 +-
src/cursors/cursorDelete.png | Bin 0 -> 1322 bytes
src/cursors/cursorMovePoint.png | Bin 0 -> 1335 bytes
src/dem/CDemDraw.cpp | 5 +
src/dem/CDemDraw.h | 1 +
src/dem/CDemPathSetup.cpp | 7 +-
src/dem/CDemVRT.cpp | 1 +
src/device/IDevice.cpp | 2 +
src/device/IDeviceWatcher.cpp | 3 +
src/gis/CGisListWks.cpp | 319 ++-
src/gis/CGisListWks.h | 8 +
src/gis/CGisWidget.cpp | 70 +-
src/gis/CGisWidget.h | 8 +
src/gis/CSelDevices.cpp | 3 +
src/gis/IGisItem.cpp | 6 +-
src/gis/IGisLine.cpp | 65 +-
src/gis/IGisLine.h | 36 +-
src/gis/db/CDBItem.cpp | 2 +-
src/gis/db/CDBProject.cpp | 10 +-
src/gis/db/CSelectDBFolder.cpp | 3 +
src/gis/db/CSelectSaveAction.cpp | 3 +
src/gis/db/CSetupFolder.cpp | 3 +
src/gis/db/IDB.cpp | 7 +-
src/gis/db/macros.h | 8 +-
src/gis/gpx/CGpxProject.cpp | 22 +-
src/gis/ovl/CGisItemOvlArea.cpp | 39 +-
src/gis/ovl/CGisItemOvlArea.h | 8 +-
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/ovl/IScrOptOvlArea.ui | 9 +
src/gis/prj/CDetailsPrj.cpp | 13 +
src/gis/prj/IGisProject.cpp | 113 +-
src/gis/prj/IGisProject.h | 42 +-
src/gis/qms/CQmsProject.cpp | 1 +
src/gis/qms/serialization.cpp | 20 +-
src/gis/rte/CCreateRouteFromWpt.cpp | 138 ++
.../rte/{CScrOptRte.h => CCreateRouteFromWpt.h} | 35 +-
src/gis/rte/CGisItemRte.cpp | 304 ++-
src/gis/rte/CGisItemRte.h | 53 +-
src/gis/rte/CScrOptRte.cpp | 25 +-
src/gis/rte/CScrOptRte.h | 3 +
src/gis/rte/ICreateRouteFromWpt.ui | 130 ++
src/gis/rte/IScrOptRte.ui | 55 +-
.../rte/router/CRouterMapQuest.cpp} | 21 +-
.../rte/router/CRouterMapQuest.h} | 22 +-
src/gis/rte/router/CRouterRoutino.cpp | 238 ++
.../rte/{CScrOptRte.h => router/CRouterRoutino.h} | 40 +-
.../rte/router/CRouterRoutinoPathSetup.cpp} | 21 +-
.../CRouterRoutinoPathSetup.h} | 36 +-
src/gis/rte/router/CRouterSetup.cpp | 87 +
.../rte/{CScrOptRte.h => router/CRouterSetup.h} | 36 +-
src/gis/{IGisLine.cpp => rte/router/IRouter.cpp} | 8 +-
src/gis/rte/{CScrOptRte.h => router/IRouter.h} | 32 +-
src/gis/rte/router/IRouterMapQuest.ui | 31 +
src/gis/rte/router/IRouterRoutino.ui | 142 ++
.../rte/router/IRouterRoutinoPathSetup.ui} | 111 +-
src/gis/rte/router/IRouterSetup.ui | 42 +
src/gis/tnv/serialization.cpp | 24 +-
src/gis/trk/CCombineTrk.cpp | 29 +-
src/gis/trk/CCombineTrk.h | 2 +-
src/gis/trk/CDetailsTrk.cpp | 2 -
src/gis/trk/CGisItemTrk.cpp | 81 +-
src/gis/trk/CGisItemTrk.h | 21 +-
src/gis/trk/CScrOptTrk.cpp | 3 +-
src/gis/trk/IScrOptTrk.ui | 4 +-
src/gis/trk/filter/CFilterNewDate.cpp | 1 +
src/gis/trk/filter/IFilterNewDate.ui | 10 +
src/gis/trk/filter/filter.cpp | 4 +-
src/gis/wpt/CScrOptWpt.cpp | 2 +-
src/gis/wpt/IScrOptWpt.ui | 11 +-
src/grid/CGrid.cpp | 2 +
src/helpers/CSelectCopyAction.cpp | 5 +
src/helpers/CSelectProjectDialog.cpp | 3 +
src/icons/32x32/A.png | Bin 0 -> 730 bytes
src/icons/32x32/AddArea.png | Bin 1288 -> 1385 bytes
src/icons/32x32/AddRte.png | Bin 0 -> 786 bytes
src/icons/32x32/AddTrk.png | Bin 979 -> 1029 bytes
src/icons/32x32/AddWpt.png | Bin 852 -> 831 bytes
src/icons/32x32/CloneMapWorkspace.png | Bin 0 -> 1635 bytes
src/icons/32x32/O.png | Bin 0 -> 839 bytes
src/icons/32x32/Route.png | Bin 2379 -> 887 bytes
src/icons/32x32/RouteSetup.png | Bin 0 -> 842 bytes
src/icons/32x32/V.png | Bin 0 -> 693 bytes
src/icons/48x48/A.png | Bin 0 -> 1029 bytes
src/icons/48x48/AddArea.png | Bin 2044 -> 2198 bytes
src/icons/48x48/AddRte.png | Bin 0 -> 1032 bytes
src/icons/48x48/AddTrk.png | Bin 1235 -> 1519 bytes
src/icons/48x48/AddWpt.png | Bin 1228 -> 1189 bytes
src/icons/48x48/CloneMapWorkspace.png | Bin 0 -> 2521 bytes
src/icons/48x48/O.png | Bin 0 -> 1234 bytes
src/icons/48x48/Route.png | Bin 4379 -> 1246 bytes
src/icons/48x48/RouteSetup.png | Bin 0 -> 1261 bytes
src/icons/48x48/V.png | Bin 0 -> 1071 bytes
src/icons/A.svg | 67 +
src/icons/AddArea.svg | 14 +-
src/icons/AddRte.svg | 112 +
src/icons/AddTrk.svg | 8 +-
src/icons/AddWpt.svg | 55 +-
src/icons/CloneMapWorkspace.svg | 135 ++
src/icons/O.svg | 67 +
src/icons/Route.svg | 185 +-
src/icons/RouteSetup.svg | 118 +
src/icons/V.svg | 67 +
src/locale/qmapshack_cs.ts | 1298 ++++++++---
src/locale/qmapshack_de.ts | 1361 ++++++++----
src/locale/qmapshack_es.ts | 1298 ++++++++---
src/locale/qmapshack_fr.ts | 1506 +++++++++----
src/map/CMapDraw.cpp | 14 +-
src/map/CMapDraw.h | 5 +-
src/map/CMapIMG.cpp | 16 +-
src/map/CMapIMG.h | 2 +-
src/map/CMapList.cpp | 2 +-
src/map/CMapPathSetup.cpp | 7 +-
src/map/CMapRMAP.h | 4 +-
src/map/CMapVRT.cpp | 1 +
src/map/CMapWMTS.cpp | 18 +-
src/map/IMap.cpp | 2 +-
src/map/IMap.h | 2 +-
src/map/IMapPathSetup.ui | 40 +-
templates/source.cpp => src/mouse/CMouseDummy.cpp | 12 +-
src/mouse/{CScrOptEditLine.h => CMouseDummy.h} | 33 +-
src/mouse/CMouseEditArea.cpp | 23 +-
src/mouse/CMouseEditArea.h | 8 +-
src/mouse/{CMouseEditTrk.cpp => CMouseEditRte.cpp} | 65 +-
src/mouse/{CMouseEditTrk.h => CMouseEditRte.h} | 23 +-
src/mouse/CMouseEditTrk.cpp | 31 +-
src/mouse/CMouseEditTrk.h | 7 +-
src/mouse/CMouseMoveWpt.cpp | 2 +-
src/mouse/CMouseMoveWpt.h | 2 +-
src/mouse/CMouseNormal.cpp | 19 +-
src/mouse/CMouseNormal.h | 3 +-
src/mouse/CMouseRangeTrk.cpp | 4 +-
src/mouse/CMouseRangeTrk.h | 2 +-
src/mouse/CMouseWptBubble.cpp | 2 +-
src/mouse/CMouseWptBubble.h | 2 +-
src/mouse/CScrOptPoint.cpp | 4 +-
src/mouse/CScrOptPoint.h | 2 +-
src/mouse/CScrOptRange.cpp | 4 +-
src/mouse/CScrOptRange.h | 2 +-
src/mouse/CScrOptRangeTrk.cpp | 8 +-
src/mouse/CScrOptRangeTrk.h | 2 +-
src/mouse/CScrOptUnclutter.cpp | 8 +-
src/mouse/CScrOptUnclutter.h | 2 +-
src/mouse/IMouse.h | 8 +-
src/mouse/IMouseEditLine.cpp | 903 --------
src/mouse/IScrOpt.cpp | 28 +-
src/mouse/IScrOpt.h | 12 +-
src/mouse/IScrOptEditLine.ui | 97 -
src/mouse/line/CLineOpAddPoint.cpp | 243 +++
.../line/CLineOpAddPoint.h} | 39 +-
src/mouse/line/CLineOpDeletePoint.cpp | 73 +
.../CLineOpDeletePoint.h} | 26 +-
src/mouse/line/CLineOpMovePoint.cpp | 150 ++
.../line/CLineOpMovePoint.h} | 36 +-
src/mouse/line/CLineOpSelectRange.cpp | 211 ++
.../line/CLineOpSelectRange.h} | 48 +-
src/mouse/{ => line}/CScrOptEditLine.cpp | 6 +-
src/mouse/{ => line}/CScrOptEditLine.h | 2 +-
.../CScrOptRangeLine.cpp} | 22 +-
.../{CScrOptRangeTrk.h => line/CScrOptRangeLine.h} | 19 +-
src/mouse/line/ILineOp.cpp | 377 ++++
src/mouse/line/ILineOp.h | 111 +
src/mouse/line/IMouseEditLine.cpp | 402 ++++
src/mouse/{ => line}/IMouseEditLine.h | 115 +-
src/mouse/line/IScrOptEditLine.ui | 338 +++
src/mouse/line/IScrOptRangeLine.ui | 51 +
src/plot/IPlot.cpp | 6 +-
src/plot/IPlot.h | 3 +
src/qlgt/CQlgtDb.cpp | 27 +-
src/qlgt/CQmsDb.cpp | 2 +-
src/resources.qrc | 19 +
src/{qlgt => tool}/CImportDatabase.cpp | 2 +-
src/{qlgt => tool}/CImportDatabase.h | 0
src/{map => tool}/CMapVrtBuilder.cpp | 82 +-
src/{map => tool}/CMapVrtBuilder.h | 20 +-
src/tool/CRoutinoDatabaseBuilder.cpp | 193 ++
.../CRoutinoDatabaseBuilder.h} | 44 +-
src/{qlgt => tool}/IImportDatabase.ui | 0
src/{map => tool}/IMapVrtBuilder.ui | 0
.../IRoutinoDatabaseBuilder.ui} | 49 +-
src/tool/IToolShell.cpp | 134 ++
src/{map/CMapVrtBuilder.h => tool/IToolShell.h} | 38 +-
src/xml/routino/routino-profiles.xml | 509 +++++
src/xml/routino/routino-tagging-nomodify.xml | 57 +
src/xml/routino/routino-tagging.xml | 1025 +++++++++
src/xml/routino/routino-translations.xml | 577 +++++
templates/header.h | 2 +-
templates/{source.cpp => source.c} | 12 +-
templates/source.cpp | 2 +-
548 files changed, 84959 insertions(+), 3893 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list