This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qmapshack.
commit 4b9bfc32d1cf5395e7efef07e05fefa9c4f84eb4 Merge: b015007 04568b9 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Sep 14 00:59:52 2015 +0200 Merge tag 'upstream/1.3.1' Upstream version 1.3.1 .hgsub | 1 - .hgsubstate | 1 - 3rdparty/CGetOpt/CGetOpt.cpp | 711 ------ 3rdparty/CGetOpt/CGetOpt.h | 126 -- 3rdparty/CGetOpt/CMakeLists.txt | 52 - 3rdparty/CGetOpt/classGetOpt.html | 864 -------- 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 119726 -> 0 bytes 3rdparty/Routino/doc/html/example1.png | Bin 136817 -> 0 bytes 3rdparty/Routino/doc/html/example2.png | Bin 95408 -> 0 bytes 3rdparty/Routino/doc/html/example3.png | Bin 82532 -> 0 bytes 3rdparty/Routino/doc/html/example4.png | Bin 67635 -> 0 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 233 -> 0 bytes .../Routino/web/www/routino/icons/waypoint-add.png | Bin 177 -> 0 bytes .../web/www/routino/icons/waypoint-centre.png | Bin 142 -> 0 bytes .../web/www/routino/icons/waypoint-coords.png | Bin 162 -> 0 bytes .../web/www/routino/icons/waypoint-down.png | Bin 200 -> 0 bytes .../web/www/routino/icons/waypoint-home.png | Bin 185 -> 0 bytes .../web/www/routino/icons/waypoint-left.png | Bin 164 -> 0 bytes .../web/www/routino/icons/waypoint-locate.png | Bin 541 -> 0 bytes .../web/www/routino/icons/waypoint-recentre.png | Bin 146 -> 0 bytes .../web/www/routino/icons/waypoint-remove.png | Bin 229 -> 0 bytes .../web/www/routino/icons/waypoint-right.png | Bin 153 -> 0 bytes .../web/www/routino/icons/waypoint-search.png | Bin 249 -> 0 bytes .../Routino/web/www/routino/icons/waypoint-up.png | Bin 241 -> 0 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 ----- 3rdparty/RoutinoLib/routino.c | 426 ---- 3rdparty/RoutinoLib/routino.h | 130 -- CMakeLists.txt | 12 +- CMakeLists.txt.user | 6 +- MacOSX/bundle.sh | 316 +++ MacOSX/resources/Contents/Info.plist | 51 + MacOSX/resources/Contents/Resources/QMapShack.icns | Bin 0 -> 289232 bytes .../Contents/Resources/cs.lproj/locversion.plist | 15 + .../Contents/Resources/de.lproj/locversion.plist | 15 + .../Contents/Resources/en.lproj/locversion.plist | 15 + .../Contents/Resources/es.lproj/locversion.plist | 15 + MacOSX/resources/QMapShack.png | Bin 0 -> 93596 bytes README.md | 3 +- changelog.txt | 35 + cmake/Modules/FindROUTINO.cmake | 92 + nsi/3rdparty.txt | 4 + nsi/QMapShack_Installer.nsi | 20 +- nsi/copyfiles.bat | 20 +- src/CAbout.cpp | 2 + src/CMainWindow.cpp | 23 +- src/CMainWindow.h | 6 +- src/CMakeLists.txt | 85 +- src/GeoMath.cpp | 89 +- src/GeoMath.h | 12 +- src/IAbout.ui | 80 +- src/IMainWindow.ui | 32 +- src/canvas/CCanvas.cpp | 77 +- src/canvas/CCanvas.h | 15 +- src/canvas/IDrawContext.cpp | 2 +- src/dem/CDemDraw.cpp | 5 +- src/dem/CDemPathSetup.cpp | 2 +- src/dem/CDemVRT.cpp | 6 +- src/dem/IDem.cpp | 1 + src/dem/IDem.h | 1 - src/device/CDeviceWatcherMac.cpp | 226 ++ src/device/CDeviceWatcherMac.h | 78 + src/device/IDevice.cpp | 4 +- src/device/IDeviceWatcher.cpp | 5 +- src/gis/CGisListDB.cpp | 40 +- src/gis/CGisListWks.cpp | 103 +- src/gis/CGisListWks.h | 2 + src/gis/CGisWidget.cpp | 24 +- src/gis/CGisWidget.h | 2 + src/gis/CSelDevices.cpp | 5 +- src/gis/IGisItem.cpp | 35 +- src/gis/IGisItem.h | 21 +- src/gis/WptIcons.cpp | 10 +- src/gis/db/CDBProject.cpp | 14 +- src/gis/db/CSelectDBFolder.cpp | 5 +- src/gis/db/CSelectSaveAction.cpp | 5 +- src/gis/db/CSetupDatabase.cpp | 2 +- src/gis/db/CSetupFolder.cpp | 5 +- src/gis/db/macros.h | 8 - src/gis/gpx/CGpxProject.cpp | 14 +- src/gis/ovl/CGisItemOvlArea.cpp | 54 +- src/gis/ovl/CGisItemOvlArea.h | 8 +- src/gis/ovl/CScrOptOvlArea.cpp | 10 +- src/gis/ovl/IDetailsOvlArea.ui | 38 +- src/gis/prj/CDetailsPrj.cpp | 258 ++- src/gis/prj/CDetailsPrj.h | 23 +- src/gis/prj/IGisProject.cpp | 88 +- src/gis/prj/IGisProject.h | 29 + src/gis/qms/CQmsProject.cpp | 6 +- src/gis/qms/serialization.cpp | 86 +- src/gis/rte/CCreateRouteFromWpt.cpp | 8 +- src/gis/rte/CDetailsRte.cpp | 168 ++ .../binout.h => src/gis/rte/CDetailsRte.h | 33 +- src/gis/rte/CGisItemRte.cpp | 472 +++- src/gis/rte/CGisItemRte.h | 95 +- src/gis/rte/CScrOptRte.cpp | 32 + src/gis/rte/CScrOptRte.h | 2 + src/gis/rte/IDetailsRte.ui | 211 ++ src/gis/rte/IScrOptRte.ui | 17 +- src/gis/rte/router/CRouterMapQuest.cpp | 331 ++- src/gis/rte/router/CRouterMapQuest.h | 22 +- src/gis/rte/router/CRouterRoutino.cpp | 362 +++- src/gis/rte/router/CRouterRoutino.h | 11 +- src/gis/rte/router/CRouterRoutinoPathSetup.cpp | 2 +- src/gis/rte/router/CRouterSetup.cpp | 2 +- src/gis/rte/router/CRouterSetup.h | 2 +- src/gis/rte/router/IRouter.h | 2 +- src/gis/rte/router/IRouterMapQuest.ui | 94 +- src/gis/rte/router/IRouterRoutino.ui | 20 +- src/gis/rte/router/IRouterSetup.ui | 13 +- src/gis/search/CSearchGoogle.cpp | 1 - src/gis/tnv/CTwoNavProject.cpp | 8 +- src/gis/tnv/serialization.cpp | 22 +- src/gis/trk/CDetailsTrk.cpp | 4 +- src/gis/trk/CGisItemTrk.cpp | 85 +- src/gis/trk/CGisItemTrk.h | 31 +- src/gis/trk/CScrOptTrk.cpp | 25 +- src/gis/trk/filter/CFilterDelete.cpp | 5 +- src/gis/trk/filter/CFilterDouglasPeuker.cpp | 5 +- src/gis/trk/filter/CFilterMedian.cpp | 5 +- src/gis/trk/filter/CFilterNewDate.cpp | 5 +- src/gis/trk/filter/CFilterObscureDate.cpp | 5 +- src/gis/trk/filter/CFilterOffsetElevation.cpp | 5 +- src/gis/trk/filter/CFilterReplaceElevation.cpp | 5 +- src/gis/trk/filter/CFilterReset.cpp | 5 +- src/gis/trk/filter/CFilterSpeed.cpp | 5 +- src/gis/wpt/CDetailsWpt.cpp | 1 + src/gis/wpt/CGisItemWpt.cpp | 30 +- src/gis/wpt/CGisItemWpt.h | 8 +- src/gis/wpt/CScrOptWpt.cpp | 8 + src/gis/wpt/CSetupNewWpt.cpp | 2 - src/gis/wpt/IDetailsWpt.ui | 607 +++--- src/grid/CGrid.cpp | 20 +- src/grid/CGrid.h | 2 +- src/grid/CGridSetup.cpp | 2 +- src/grid/CProjWizard.cpp | 4 +- src/helpers/CAppSetup.cpp | 272 +++ src/helpers/CAppSetup.h | 82 + src/helpers/CCommandProcessor.cpp | 59 + src/helpers/CCommandProcessor.h | 32 + src/helpers/CProgressDialog.cpp | 80 + .../CProgressDialog.h} | 50 +- src/helpers/CSelectCopyAction.cpp | 7 +- src/helpers/CSelectProjectDialog.cpp | 93 +- src/helpers/CSelectProjectDialog.h | 3 +- src/helpers/IProgressDialog.ui | 85 + src/helpers/ISelectProjectDialog.ui | 132 +- src/icons/32x32/A.png | Bin 730 -> 679 bytes src/icons/32x32/O.png | Bin 839 -> 734 bytes src/icons/32x32/RteInstr.png | Bin 0 -> 1118 bytes src/icons/32x32/V.png | Bin 693 -> 680 bytes src/icons/32x32/Zoom.png | Bin 0 -> 1154 bytes src/icons/48x48/A.png | Bin 1029 -> 941 bytes src/icons/48x48/O.png | Bin 1234 -> 1090 bytes src/icons/48x48/RteInstr.png | Bin 0 -> 1518 bytes src/icons/48x48/V.png | Bin 1071 -> 991 bytes src/icons/48x48/Zoom.png | Bin 0 -> 1784 bytes src/icons/A.svg | 21 +- src/icons/O.svg | 21 +- src/icons/RteInstr.svg | 109 + src/icons/V.svg | 21 +- src/icons/{O.svg => Zoom.svg} | 26 +- src/icons/waypoints/32x32/CityCapitol.png | Bin 0 -> 604 bytes src/icons/waypoints/32x32/CityLarge.png | Bin 0 -> 502 bytes src/icons/waypoints/32x32/CityMedium.png | Bin 0 -> 424 bytes src/icons/waypoints/32x32/CitySmall.png | Bin 0 -> 352 bytes src/icons/{O.svg => waypoints/CityCapitol.svg} | 67 +- src/icons/{A.svg => waypoints/CityLarge.svg} | 67 +- src/icons/{O.svg => waypoints/CityMedium.svg} | 67 +- src/icons/{O.svg => waypoints/CitySmall.svg} | 67 +- src/locale/qmapshack_cs.ts | 2130 +++++++++++------- src/locale/qmapshack_de.ts | 1781 ++++++++++----- src/locale/qmapshack_es.ts | 1712 ++++++++++----- src/locale/qmapshack_fr.ts | 1746 ++++++++++----- src/main.cpp | 149 +- src/map/CMapIMG.cpp | 8 +- src/map/CMapList.cpp | 2 +- src/map/CMapMAP.cpp | 2 +- src/map/CMapPathSetup.cpp | 2 +- src/map/CMapRMAP.cpp | 16 +- src/map/CMapTMS.cpp | 4 +- src/map/CMapVRT.cpp | 8 +- src/map/CMapWMTS.cpp | 10 +- src/map/garmin/CGarminTyp.cpp | 4 +- src/mouse/CMouseEditArea.cpp | 9 +- src/mouse/CMouseEditRte.cpp | 8 +- src/mouse/CMouseEditTrk.cpp | 8 +- src/mouse/CMouseMoveWpt.cpp | 2 + src/mouse/CMouseNormal.cpp | 43 +- src/mouse/CMouseNormal.h | 1 + src/mouse/CMouseRangeTrk.cpp | 6 + src/mouse/CMouseWptBubble.cpp | 6 + src/mouse/CScrOptPoint.cpp | 43 - src/mouse/CScrOptPoint.h | 35 - src/mouse/CScrOptRange.cpp | 42 - src/mouse/CScrOptRange.h | 35 - src/mouse/CScrOptRangeTrk.cpp | 9 +- src/mouse/CScrOptUnclutter.cpp | 6 +- src/mouse/IScrOpt.cpp | 8 +- src/mouse/IScrOptPoint.ui | 108 - src/mouse/IScrOptRange.ui | 49 - src/mouse/line/CLineOpAddPoint.cpp | 6 +- src/mouse/line/CLineOpSelectRange.cpp | 13 +- src/mouse/line/ILineOp.cpp | 80 +- src/mouse/line/ILineOp.h | 2 + src/mouse/line/IMouseEditLine.cpp | 108 +- src/mouse/line/IMouseEditLine.h | 13 +- src/mouse/line/IScrOptEditLine.ui | 35 +- src/plot/CPlotAxis.cpp | 11 +- src/plot/IPlot.cpp | 40 +- src/plot/IPlot.h | 6 +- src/qlgt/CQlgtDb.cpp | 42 +- src/qlgt/CQlgtTrack.cpp | 8 +- src/qlgt/CQmsDb.cpp | 2 +- src/resources.qrc | 23 +- src/tool/CRoutinoDatabaseBuilder.cpp | 32 +- src/tool/CRoutinoDatabaseBuilder.h | 2 - src/tool/IToolShell.cpp | 2 - 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 ----- 545 files changed, 10605 insertions(+), 80869 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel