[routino] 01/06: Imported Upstream version 3.2
Bas Couwenberg
sebastic at debian.org
Wed Mar 15 06:47:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository routino.
commit ee49c67b8c5820878d42f26326c9f3d1524a6777
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 15 07:24:38 2017 +0100
Imported Upstream version 3.2
---
ChangeLog | 175 ++++++++++++++++++++++++++++
doc/INSTALL.txt | 8 +-
doc/NEWS.txt | 34 ++++++
doc/README.txt | 5 +-
doc/html/installation.html | 8 +-
doc/html/readme.html | 70 ++++-------
extras/find-fixme/web/www/fixme.cgi | 4 +-
extras/statistics/dumper.c | 15 +++
src/filedumperx.c | 6 +-
src/functions.h | 4 +-
src/optimiser.c | 3 +
src/output.c | 15 ++-
src/planetsplitter.c | 15 +--
src/router+lib.c | 30 ++---
src/router.c | 34 +++---
src/routino.c | 4 +-
src/test/expected/turns-WP01.txt | 2 +-
src/test/expected/turns-WP02.txt | 2 +-
src/test/expected/turns-WP03.txt | 2 +-
src/test/expected/turns-WP04.txt | 10 +-
src/test/expected/turns-WP05.txt | 10 +-
src/test/expected/turns-WP06.txt | 10 +-
src/test/expected/turns-WP07.txt | 8 +-
src/test/expected/turns-WP08.txt | 8 +-
src/test/expected/turns-WP09.txt | 8 +-
src/test/expected/turns-WP10.txt | 8 +-
src/test/expected/turns-WP11.txt | 8 +-
src/test/expected/turns-WP12.txt | 8 +-
src/test/expected/turns-WP13.txt | 12 +-
src/test/expected/turns-WP14.txt | 12 +-
src/test/expected/turns-WP15.txt | 12 +-
src/translations.c | 14 +--
src/version.h | 4 +-
web/translations/router.html | 22 ++--
web/translations/translation.de.txt | 18 +++
web/translations/translation.fr.txt | 20 +++-
web/translations/translation.pl.txt | 10 ++
web/translations/translation.ru.txt | 98 +++++++++++++++-
web/www/leaflet/install.sh | 6 +-
web/www/routino/icons/ball-0.png | Bin 128 -> 139 bytes
web/www/routino/icons/ball-1.png | Bin 129 -> 142 bytes
web/www/routino/icons/ball-2.png | Bin 133 -> 144 bytes
web/www/routino/icons/ball-3.png | Bin 130 -> 139 bytes
web/www/routino/icons/ball-4.png | Bin 136 -> 153 bytes
web/www/routino/icons/ball-5.png | Bin 134 -> 145 bytes
web/www/routino/icons/ball-6.png | Bin 134 -> 150 bytes
web/www/routino/icons/ball-7.png | Bin 130 -> 139 bytes
web/www/routino/icons/ball-8.png | Bin 130 -> 139 bytes
web/www/routino/icons/ball-9.png | Bin 130 -> 139 bytes
web/www/routino/icons/limit-0.0.png | Bin 448 -> 759 bytes
web/www/routino/icons/limit-0.1.png | Bin 684 -> 1323 bytes
web/www/routino/icons/limit-0.2.png | Bin 730 -> 1378 bytes
web/www/routino/icons/limit-0.3.png | Bin 712 -> 1398 bytes
web/www/routino/icons/limit-0.4.png | Bin 696 -> 1331 bytes
web/www/routino/icons/limit-0.5.png | Bin 754 -> 1391 bytes
web/www/routino/icons/limit-0.6.png | Bin 706 -> 1360 bytes
web/www/routino/icons/limit-0.7.png | Bin 740 -> 1364 bytes
web/www/routino/icons/limit-0.8.png | Bin 719 -> 1372 bytes
web/www/routino/icons/limit-0.9.png | Bin 714 -> 1353 bytes
web/www/routino/icons/limit-0.png | Bin 448 -> 759 bytes
web/www/routino/icons/limit-1.0.png | Bin 687 -> 1283 bytes
web/www/routino/icons/limit-1.1.png | Bin 583 -> 1152 bytes
web/www/routino/icons/limit-1.2.png | Bin 692 -> 1320 bytes
web/www/routino/icons/limit-1.3.png | Bin 691 -> 1351 bytes
web/www/routino/icons/limit-1.4.png | Bin 660 -> 1264 bytes
web/www/routino/icons/limit-1.5.png | Bin 723 -> 1350 bytes
web/www/routino/icons/limit-1.6.png | Bin 681 -> 1329 bytes
web/www/routino/icons/limit-1.7.png | Bin 693 -> 1240 bytes
web/www/routino/icons/limit-1.8.png | Bin 685 -> 1339 bytes
web/www/routino/icons/limit-1.9.png | Bin 687 -> 1345 bytes
web/www/routino/icons/limit-1.png | Bin 537 -> 1000 bytes
web/www/routino/icons/limit-10.0.png | Bin 763 -> 1527 bytes
web/www/routino/icons/limit-10.1.png | Bin 735 -> 1468 bytes
web/www/routino/icons/limit-10.2.png | Bin 803 -> 1563 bytes
web/www/routino/icons/limit-10.3.png | Bin 801 -> 1553 bytes
web/www/routino/icons/limit-10.4.png | Bin 754 -> 1511 bytes
web/www/routino/icons/limit-10.5.png | Bin 825 -> 1571 bytes
web/www/routino/icons/limit-10.6.png | Bin 792 -> 1558 bytes
web/www/routino/icons/limit-10.7.png | Bin 809 -> 1517 bytes
web/www/routino/icons/limit-10.8.png | Bin 795 -> 1562 bytes
web/www/routino/icons/limit-10.9.png | Bin 799 -> 1547 bytes
web/www/routino/icons/limit-10.png | Bin 670 -> 1271 bytes
web/www/routino/icons/limit-100.png | Bin 737 -> 1417 bytes
web/www/routino/icons/limit-101.png | Bin 709 -> 1351 bytes
web/www/routino/icons/limit-102.png | Bin 775 -> 1489 bytes
web/www/routino/icons/limit-103.png | Bin 767 -> 1475 bytes
web/www/routino/icons/limit-104.png | Bin 726 -> 1429 bytes
web/www/routino/icons/limit-105.png | Bin 793 -> 1502 bytes
web/www/routino/icons/limit-106.png | Bin 760 -> 1484 bytes
web/www/routino/icons/limit-107.png | Bin 786 -> 1442 bytes
web/www/routino/icons/limit-108.png | Bin 762 -> 1483 bytes
web/www/routino/icons/limit-109.png | Bin 763 -> 1485 bytes
web/www/routino/icons/limit-11.0.png | Bin 732 -> 1455 bytes
web/www/routino/icons/limit-11.1.png | Bin 655 -> 1351 bytes
web/www/routino/icons/limit-11.2.png | Bin 724 -> 1398 bytes
web/www/routino/icons/limit-11.3.png | Bin 731 -> 1436 bytes
web/www/routino/icons/limit-11.4.png | Bin 716 -> 1431 bytes
web/www/routino/icons/limit-11.5.png | Bin 752 -> 1472 bytes
web/www/routino/icons/limit-11.6.png | Bin 726 -> 1458 bytes
web/www/routino/icons/limit-11.7.png | Bin 737 -> 1403 bytes
web/www/routino/icons/limit-11.8.png | Bin 730 -> 1468 bytes
web/www/routino/icons/limit-11.9.png | Bin 733 -> 1454 bytes
web/www/routino/icons/limit-11.png | Bin 572 -> 1109 bytes
web/www/routino/icons/limit-110.png | Bin 716 -> 1387 bytes
web/www/routino/icons/limit-111.png | Bin 574 -> 1147 bytes
web/www/routino/icons/limit-112.png | Bin 730 -> 1377 bytes
web/www/routino/icons/limit-113.png | Bin 722 -> 1389 bytes
web/www/routino/icons/limit-114.png | Bin 688 -> 1376 bytes
web/www/routino/icons/limit-115.png | Bin 756 -> 1400 bytes
web/www/routino/icons/limit-116.png | Bin 713 -> 1399 bytes
web/www/routino/icons/limit-117.png | Bin 731 -> 1346 bytes
web/www/routino/icons/limit-118.png | Bin 716 -> 1440 bytes
web/www/routino/icons/limit-119.png | Bin 724 -> 1405 bytes
web/www/routino/icons/limit-12.0.png | Bin 804 -> 1573 bytes
web/www/routino/icons/limit-12.1.png | Bin 746 -> 1460 bytes
web/www/routino/icons/limit-12.2.png | Bin 805 -> 1526 bytes
web/www/routino/icons/limit-12.3.png | Bin 817 -> 1542 bytes
web/www/routino/icons/limit-12.4.png | Bin 769 -> 1499 bytes
web/www/routino/icons/limit-12.5.png | Bin 827 -> 1576 bytes
web/www/routino/icons/limit-12.6.png | Bin 823 -> 1557 bytes
web/www/routino/icons/limit-12.7.png | Bin 810 -> 1505 bytes
web/www/routino/icons/limit-12.8.png | Bin 833 -> 1558 bytes
web/www/routino/icons/limit-12.9.png | Bin 804 -> 1552 bytes
web/www/routino/icons/limit-12.png | Bin 678 -> 1261 bytes
web/www/routino/icons/limit-120.png | Bin 778 -> 1499 bytes
web/www/routino/icons/limit-121.png | Bin 721 -> 1351 bytes
web/www/routino/icons/limit-122.png | Bin 792 -> 1469 bytes
web/www/routino/icons/limit-123.png | Bin 798 -> 1482 bytes
web/www/routino/icons/limit-124.png | Bin 757 -> 1432 bytes
web/www/routino/icons/limit-125.png | Bin 806 -> 1493 bytes
web/www/routino/icons/limit-126.png | Bin 801 -> 1496 bytes
web/www/routino/icons/limit-127.png | Bin 789 -> 1450 bytes
web/www/routino/icons/limit-128.png | Bin 805 -> 1481 bytes
web/www/routino/icons/limit-129.png | Bin 776 -> 1488 bytes
web/www/routino/icons/limit-13.0.png | Bin 804 -> 1569 bytes
web/www/routino/icons/limit-13.1.png | Bin 756 -> 1473 bytes
web/www/routino/icons/limit-13.2.png | Bin 824 -> 1552 bytes
web/www/routino/icons/limit-13.3.png | Bin 806 -> 1539 bytes
web/www/routino/icons/limit-13.4.png | Bin 762 -> 1518 bytes
web/www/routino/icons/limit-13.5.png | Bin 827 -> 1566 bytes
web/www/routino/icons/limit-13.6.png | Bin 836 -> 1570 bytes
web/www/routino/icons/limit-13.7.png | Bin 811 -> 1504 bytes
web/www/routino/icons/limit-13.8.png | Bin 833 -> 1552 bytes
web/www/routino/icons/limit-13.9.png | Bin 837 -> 1521 bytes
web/www/routino/icons/limit-13.png | Bin 672 -> 1270 bytes
web/www/routino/icons/limit-130.png | Bin 755 -> 1467 bytes
web/www/routino/icons/limit-131.png | Bin 716 -> 1357 bytes
web/www/routino/icons/limit-132.png | Bin 804 -> 1492 bytes
web/www/routino/icons/limit-133.png | Bin 777 -> 1484 bytes
web/www/routino/icons/limit-134.png | Bin 726 -> 1412 bytes
web/www/routino/icons/limit-135.png | Bin 809 -> 1497 bytes
web/www/routino/icons/limit-136.png | Bin 792 -> 1487 bytes
web/www/routino/icons/limit-137.png | Bin 789 -> 1405 bytes
web/www/routino/icons/limit-138.png | Bin 796 -> 1500 bytes
web/www/routino/icons/limit-139.png | Bin 773 -> 1473 bytes
web/www/routino/icons/limit-14.0.png | Bin 759 -> 1505 bytes
web/www/routino/icons/limit-14.1.png | Bin 734 -> 1458 bytes
web/www/routino/icons/limit-14.2.png | Bin 762 -> 1463 bytes
web/www/routino/icons/limit-14.3.png | Bin 763 -> 1490 bytes
web/www/routino/icons/limit-14.4.png | Bin 706 -> 1452 bytes
web/www/routino/icons/limit-14.5.png | Bin 758 -> 1510 bytes
web/www/routino/icons/limit-14.6.png | Bin 761 -> 1496 bytes
web/www/routino/icons/limit-14.7.png | Bin 777 -> 1402 bytes
web/www/routino/icons/limit-14.8.png | Bin 764 -> 1524 bytes
web/www/routino/icons/limit-14.9.png | Bin 767 -> 1496 bytes
web/www/routino/icons/limit-14.png | Bin 630 -> 1167 bytes
web/www/routino/icons/limit-140.png | Bin 726 -> 1405 bytes
web/www/routino/icons/limit-141.png | Bin 679 -> 1329 bytes
web/www/routino/icons/limit-142.png | Bin 756 -> 1447 bytes
web/www/routino/icons/limit-143.png | Bin 725 -> 1424 bytes
web/www/routino/icons/limit-144.png | Bin 664 -> 1323 bytes
web/www/routino/icons/limit-145.png | Bin 745 -> 1425 bytes
web/www/routino/icons/limit-146.png | Bin 725 -> 1461 bytes
web/www/routino/icons/limit-147.png | Bin 773 -> 1352 bytes
web/www/routino/icons/limit-148.png | Bin 727 -> 1477 bytes
web/www/routino/icons/limit-149.png | Bin 729 -> 1426 bytes
web/www/routino/icons/limit-15.0.png | Bin 817 -> 1539 bytes
web/www/routino/icons/limit-15.1.png | Bin 783 -> 1483 bytes
web/www/routino/icons/limit-15.2.png | Bin 818 -> 1527 bytes
web/www/routino/icons/limit-15.3.png | Bin 815 -> 1548 bytes
web/www/routino/icons/limit-15.4.png | Bin 763 -> 1547 bytes
web/www/routino/icons/limit-15.5.png | Bin 800 -> 1560 bytes
web/www/routino/icons/limit-15.6.png | Bin 822 -> 1551 bytes
web/www/routino/icons/limit-15.7.png | Bin 809 -> 1536 bytes
web/www/routino/icons/limit-15.8.png | Bin 814 -> 1565 bytes
web/www/routino/icons/limit-15.9.png | Bin 825 -> 1527 bytes
web/www/routino/icons/limit-15.png | Bin 672 -> 1248 bytes
web/www/routino/icons/limit-150.png | Bin 784 -> 1460 bytes
web/www/routino/icons/limit-151.png | Bin 737 -> 1371 bytes
web/www/routino/icons/limit-152.png | Bin 800 -> 1497 bytes
web/www/routino/icons/limit-153.png | Bin 792 -> 1478 bytes
web/www/routino/icons/limit-154.png | Bin 727 -> 1440 bytes
web/www/routino/icons/limit-155.png | Bin 776 -> 1494 bytes
web/www/routino/icons/limit-156.png | Bin 787 -> 1504 bytes
web/www/routino/icons/limit-157.png | Bin 782 -> 1402 bytes
web/www/routino/icons/limit-158.png | Bin 789 -> 1497 bytes
web/www/routino/icons/limit-159.png | Bin 781 -> 1476 bytes
web/www/routino/icons/limit-16.0.png | Bin 783 -> 1556 bytes
web/www/routino/icons/limit-16.1.png | Bin 743 -> 1493 bytes
web/www/routino/icons/limit-16.2.png | Bin 828 -> 1544 bytes
web/www/routino/icons/limit-16.3.png | Bin 823 -> 1566 bytes
web/www/routino/icons/limit-16.4.png | Bin 758 -> 1541 bytes
web/www/routino/icons/limit-16.5.png | Bin 822 -> 1568 bytes
web/www/routino/icons/limit-16.6.png | Bin 793 -> 1558 bytes
web/www/routino/icons/limit-16.7.png | Bin 814 -> 1486 bytes
web/www/routino/icons/limit-16.8.png | Bin 821 -> 1562 bytes
web/www/routino/icons/limit-16.9.png | Bin 797 -> 1571 bytes
web/www/routino/icons/limit-16.png | Bin 665 -> 1276 bytes
web/www/routino/icons/limit-160.png | Bin 758 -> 1465 bytes
web/www/routino/icons/limit-161.png | Bin 712 -> 1381 bytes
web/www/routino/icons/limit-162.png | Bin 806 -> 1490 bytes
web/www/routino/icons/limit-163.png | Bin 800 -> 1472 bytes
web/www/routino/icons/limit-164.png | Bin 727 -> 1430 bytes
web/www/routino/icons/limit-165.png | Bin 807 -> 1497 bytes
web/www/routino/icons/limit-166.png | Bin 778 -> 1474 bytes
web/www/routino/icons/limit-167.png | Bin 791 -> 1421 bytes
web/www/routino/icons/limit-168.png | Bin 795 -> 1467 bytes
web/www/routino/icons/limit-169.png | Bin 770 -> 1492 bytes
web/www/routino/icons/limit-17.0.png | Bin 797 -> 1525 bytes
web/www/routino/icons/limit-17.1.png | Bin 764 -> 1439 bytes
web/www/routino/icons/limit-17.2.png | Bin 814 -> 1454 bytes
web/www/routino/icons/limit-17.3.png | Bin 809 -> 1504 bytes
web/www/routino/icons/limit-17.4.png | Bin 801 -> 1504 bytes
web/www/routino/icons/limit-17.5.png | Bin 806 -> 1546 bytes
web/www/routino/icons/limit-17.6.png | Bin 819 -> 1528 bytes
web/www/routino/icons/limit-17.7.png | Bin 742 -> 1447 bytes
web/www/routino/icons/limit-17.8.png | Bin 814 -> 1527 bytes
web/www/routino/icons/limit-17.9.png | Bin 813 -> 1483 bytes
web/www/routino/icons/limit-17.png | Bin 668 -> 1179 bytes
web/www/routino/icons/limit-170.png | Bin 777 -> 1432 bytes
web/www/routino/icons/limit-171.png | Bin 717 -> 1310 bytes
web/www/routino/icons/limit-172.png | Bin 791 -> 1446 bytes
web/www/routino/icons/limit-173.png | Bin 778 -> 1448 bytes
web/www/routino/icons/limit-174.png | Bin 748 -> 1375 bytes
web/www/routino/icons/limit-175.png | Bin 785 -> 1449 bytes
web/www/routino/icons/limit-176.png | Bin 781 -> 1462 bytes
web/www/routino/icons/limit-177.png | Bin 715 -> 1326 bytes
web/www/routino/icons/limit-178.png | Bin 782 -> 1458 bytes
web/www/routino/icons/limit-179.png | Bin 781 -> 1465 bytes
web/www/routino/icons/limit-18.0.png | Bin 797 -> 1565 bytes
web/www/routino/icons/limit-18.1.png | Bin 752 -> 1501 bytes
web/www/routino/icons/limit-18.2.png | Bin 826 -> 1558 bytes
web/www/routino/icons/limit-18.3.png | Bin 831 -> 1575 bytes
web/www/routino/icons/limit-18.4.png | Bin 775 -> 1546 bytes
web/www/routino/icons/limit-18.5.png | Bin 818 -> 1594 bytes
web/www/routino/icons/limit-18.6.png | Bin 828 -> 1566 bytes
web/www/routino/icons/limit-18.7.png | Bin 812 -> 1531 bytes
web/www/routino/icons/limit-18.8.png | Bin 787 -> 1558 bytes
web/www/routino/icons/limit-18.9.png | Bin 809 -> 1568 bytes
web/www/routino/icons/limit-18.png | Bin 666 -> 1282 bytes
web/www/routino/icons/limit-180.png | Bin 756 -> 1464 bytes
web/www/routino/icons/limit-181.png | Bin 719 -> 1380 bytes
web/www/routino/icons/limit-182.png | Bin 805 -> 1505 bytes
web/www/routino/icons/limit-183.png | Bin 798 -> 1487 bytes
web/www/routino/icons/limit-184.png | Bin 740 -> 1451 bytes
web/www/routino/icons/limit-185.png | Bin 784 -> 1536 bytes
web/www/routino/icons/limit-186.png | Bin 794 -> 1492 bytes
web/www/routino/icons/limit-187.png | Bin 794 -> 1455 bytes
web/www/routino/icons/limit-188.png | Bin 751 -> 1475 bytes
web/www/routino/icons/limit-189.png | Bin 758 -> 1487 bytes
web/www/routino/icons/limit-19.0.png | Bin 794 -> 1564 bytes
web/www/routino/icons/limit-19.1.png | Bin 749 -> 1507 bytes
web/www/routino/icons/limit-19.2.png | Bin 797 -> 1560 bytes
web/www/routino/icons/limit-19.3.png | Bin 798 -> 1574 bytes
web/www/routino/icons/limit-19.4.png | Bin 765 -> 1538 bytes
web/www/routino/icons/limit-19.5.png | Bin 824 -> 1569 bytes
web/www/routino/icons/limit-19.6.png | Bin 800 -> 1569 bytes
web/www/routino/icons/limit-19.7.png | Bin 810 -> 1533 bytes
web/www/routino/icons/limit-19.8.png | Bin 806 -> 1565 bytes
web/www/routino/icons/limit-19.9.png | Bin 778 -> 1518 bytes
web/www/routino/icons/limit-19.png | Bin 675 -> 1273 bytes
web/www/routino/icons/limit-190.png | Bin 760 -> 1484 bytes
web/www/routino/icons/limit-191.png | Bin 711 -> 1405 bytes
web/www/routino/icons/limit-192.png | Bin 765 -> 1477 bytes
web/www/routino/icons/limit-193.png | Bin 757 -> 1456 bytes
web/www/routino/icons/limit-194.png | Bin 729 -> 1435 bytes
web/www/routino/icons/limit-195.png | Bin 808 -> 1498 bytes
web/www/routino/icons/limit-196.png | Bin 772 -> 1506 bytes
web/www/routino/icons/limit-197.png | Bin 789 -> 1418 bytes
web/www/routino/icons/limit-198.png | Bin 763 -> 1503 bytes
web/www/routino/icons/limit-199.png | Bin 759 -> 1476 bytes
web/www/routino/icons/limit-2.0.png | Bin 730 -> 1372 bytes
web/www/routino/icons/limit-2.1.png | Bin 707 -> 1287 bytes
web/www/routino/icons/limit-2.2.png | Bin 683 -> 1272 bytes
web/www/routino/icons/limit-2.3.png | Bin 737 -> 1358 bytes
web/www/routino/icons/limit-2.4.png | Bin 720 -> 1341 bytes
web/www/routino/icons/limit-2.5.png | Bin 773 -> 1375 bytes
web/www/routino/icons/limit-2.6.png | Bin 745 -> 1395 bytes
web/www/routino/icons/limit-2.7.png | Bin 729 -> 1305 bytes
web/www/routino/icons/limit-2.8.png | Bin 744 -> 1368 bytes
web/www/routino/icons/limit-2.9.png | Bin 737 -> 1335 bytes
web/www/routino/icons/limit-2.png | Bin 621 -> 1074 bytes
web/www/routino/icons/limit-20.0.png | Bin 820 -> 1624 bytes
web/www/routino/icons/limit-20.1.png | Bin 799 -> 1538 bytes
web/www/routino/icons/limit-20.2.png | Bin 848 -> 1564 bytes
web/www/routino/icons/limit-20.3.png | Bin 863 -> 1607 bytes
web/www/routino/icons/limit-20.4.png | Bin 819 -> 1589 bytes
web/www/routino/icons/limit-20.5.png | Bin 860 -> 1657 bytes
web/www/routino/icons/limit-20.6.png | Bin 858 -> 1587 bytes
web/www/routino/icons/limit-20.7.png | Bin 846 -> 1552 bytes
web/www/routino/icons/limit-20.8.png | Bin 867 -> 1663 bytes
web/www/routino/icons/limit-20.9.png | Bin 843 -> 1584 bytes
web/www/routino/icons/limit-20.png | Bin 725 -> 1379 bytes
web/www/routino/icons/limit-200.png | Bin 782 -> 1545 bytes
web/www/routino/icons/limit-21.0.png | Bin 818 -> 1548 bytes
web/www/routino/icons/limit-21.1.png | Bin 766 -> 1443 bytes
web/www/routino/icons/limit-21.2.png | Bin 805 -> 1492 bytes
web/www/routino/icons/limit-21.3.png | Bin 839 -> 1536 bytes
web/www/routino/icons/limit-21.4.png | Bin 787 -> 1517 bytes
web/www/routino/icons/limit-21.5.png | Bin 831 -> 1556 bytes
web/www/routino/icons/limit-21.6.png | Bin 832 -> 1530 bytes
web/www/routino/icons/limit-21.7.png | Bin 806 -> 1518 bytes
web/www/routino/icons/limit-21.8.png | Bin 840 -> 1552 bytes
web/www/routino/icons/limit-21.9.png | Bin 812 -> 1555 bytes
web/www/routino/icons/limit-21.png | Bin 691 -> 1271 bytes
web/www/routino/icons/limit-22.0.png | Bin 854 -> 1577 bytes
web/www/routino/icons/limit-22.1.png | Bin 823 -> 1517 bytes
web/www/routino/icons/limit-22.2.png | Bin 834 -> 1531 bytes
web/www/routino/icons/limit-22.3.png | Bin 849 -> 1565 bytes
web/www/routino/icons/limit-22.4.png | Bin 817 -> 1546 bytes
web/www/routino/icons/limit-22.5.png | Bin 852 -> 1592 bytes
web/www/routino/icons/limit-22.6.png | Bin 857 -> 1545 bytes
web/www/routino/icons/limit-22.7.png | Bin 826 -> 1542 bytes
web/www/routino/icons/limit-22.8.png | Bin 864 -> 1591 bytes
web/www/routino/icons/limit-22.9.png | Bin 856 -> 1547 bytes
web/www/routino/icons/limit-22.png | Bin 694 -> 1245 bytes
web/www/routino/icons/limit-23.0.png | Bin 858 -> 1612 bytes
web/www/routino/icons/limit-23.1.png | Bin 815 -> 1543 bytes
web/www/routino/icons/limit-23.2.png | Bin 834 -> 1551 bytes
web/www/routino/icons/limit-23.3.png | Bin 836 -> 1588 bytes
web/www/routino/icons/limit-23.4.png | Bin 811 -> 1562 bytes
web/www/routino/icons/limit-23.5.png | Bin 849 -> 1610 bytes
web/www/routino/icons/limit-23.6.png | Bin 858 -> 1595 bytes
web/www/routino/icons/limit-23.7.png | Bin 825 -> 1536 bytes
web/www/routino/icons/limit-23.8.png | Bin 857 -> 1612 bytes
web/www/routino/icons/limit-23.9.png | Bin 860 -> 1608 bytes
web/www/routino/icons/limit-23.png | Bin 714 -> 1379 bytes
web/www/routino/icons/limit-24.0.png | Bin 813 -> 1521 bytes
web/www/routino/icons/limit-24.1.png | Bin 787 -> 1525 bytes
web/www/routino/icons/limit-24.2.png | Bin 791 -> 1517 bytes
web/www/routino/icons/limit-24.3.png | Bin 822 -> 1547 bytes
web/www/routino/icons/limit-24.4.png | Bin 785 -> 1515 bytes
web/www/routino/icons/limit-24.5.png | Bin 841 -> 1552 bytes
web/www/routino/icons/limit-24.6.png | Bin 814 -> 1545 bytes
web/www/routino/icons/limit-24.7.png | Bin 815 -> 1466 bytes
web/www/routino/icons/limit-24.8.png | Bin 820 -> 1565 bytes
web/www/routino/icons/limit-24.9.png | Bin 818 -> 1526 bytes
web/www/routino/icons/limit-24.png | Bin 694 -> 1256 bytes
web/www/routino/icons/limit-25.0.png | Bin 861 -> 1622 bytes
web/www/routino/icons/limit-25.1.png | Bin 829 -> 1556 bytes
web/www/routino/icons/limit-25.2.png | Bin 843 -> 1575 bytes
web/www/routino/icons/limit-25.3.png | Bin 858 -> 1596 bytes
web/www/routino/icons/limit-25.4.png | Bin 832 -> 1586 bytes
web/www/routino/icons/limit-25.5.png | Bin 847 -> 1623 bytes
web/www/routino/icons/limit-25.6.png | Bin 865 -> 1606 bytes
web/www/routino/icons/limit-25.7.png | Bin 829 -> 1567 bytes
web/www/routino/icons/limit-25.8.png | Bin 864 -> 1621 bytes
web/www/routino/icons/limit-25.9.png | Bin 864 -> 1636 bytes
web/www/routino/icons/limit-25.png | Bin 772 -> 1382 bytes
web/www/routino/icons/limit-26.0.png | Bin 850 -> 1594 bytes
web/www/routino/icons/limit-26.1.png | Bin 818 -> 1555 bytes
web/www/routino/icons/limit-26.2.png | Bin 842 -> 1568 bytes
web/www/routino/icons/limit-26.3.png | Bin 842 -> 1566 bytes
web/www/routino/icons/limit-26.4.png | Bin 810 -> 1547 bytes
web/www/routino/icons/limit-26.5.png | Bin 857 -> 1605 bytes
web/www/routino/icons/limit-26.6.png | Bin 849 -> 1620 bytes
web/www/routino/icons/limit-26.7.png | Bin 831 -> 1565 bytes
web/www/routino/icons/limit-26.8.png | Bin 851 -> 1622 bytes
web/www/routino/icons/limit-26.9.png | Bin 863 -> 1609 bytes
web/www/routino/icons/limit-26.png | Bin 737 -> 1393 bytes
web/www/routino/icons/limit-27.0.png | Bin 842 -> 1583 bytes
web/www/routino/icons/limit-27.1.png | Bin 809 -> 1492 bytes
web/www/routino/icons/limit-27.2.png | Bin 820 -> 1521 bytes
web/www/routino/icons/limit-27.3.png | Bin 838 -> 1538 bytes
web/www/routino/icons/limit-27.4.png | Bin 821 -> 1526 bytes
web/www/routino/icons/limit-27.5.png | Bin 845 -> 1575 bytes
web/www/routino/icons/limit-27.6.png | Bin 849 -> 1569 bytes
web/www/routino/icons/limit-27.7.png | Bin 786 -> 1526 bytes
web/www/routino/icons/limit-27.8.png | Bin 835 -> 1556 bytes
web/www/routino/icons/limit-27.9.png | Bin 837 -> 1557 bytes
web/www/routino/icons/limit-27.png | Bin 708 -> 1235 bytes
web/www/routino/icons/limit-28.0.png | Bin 858 -> 1634 bytes
web/www/routino/icons/limit-28.1.png | Bin 829 -> 1560 bytes
web/www/routino/icons/limit-28.2.png | Bin 845 -> 1582 bytes
web/www/routino/icons/limit-28.3.png | Bin 856 -> 1572 bytes
web/www/routino/icons/limit-28.4.png | Bin 823 -> 1585 bytes
web/www/routino/icons/limit-28.5.png | Bin 859 -> 1618 bytes
web/www/routino/icons/limit-28.6.png | Bin 859 -> 1585 bytes
web/www/routino/icons/limit-28.7.png | Bin 836 -> 1545 bytes
web/www/routino/icons/limit-28.8.png | Bin 844 -> 1591 bytes
web/www/routino/icons/limit-28.9.png | Bin 868 -> 1594 bytes
web/www/routino/icons/limit-28.png | Bin 728 -> 1363 bytes
web/www/routino/icons/limit-29.0.png | Bin 817 -> 1620 bytes
web/www/routino/icons/limit-29.1.png | Bin 797 -> 1544 bytes
web/www/routino/icons/limit-29.2.png | Bin 848 -> 1580 bytes
web/www/routino/icons/limit-29.3.png | Bin 853 -> 1593 bytes
web/www/routino/icons/limit-29.4.png | Bin 809 -> 1580 bytes
web/www/routino/icons/limit-29.5.png | Bin 846 -> 1613 bytes
web/www/routino/icons/limit-29.6.png | Bin 853 -> 1607 bytes
web/www/routino/icons/limit-29.7.png | Bin 829 -> 1573 bytes
web/www/routino/icons/limit-29.8.png | Bin 858 -> 1604 bytes
web/www/routino/icons/limit-29.9.png | Bin 853 -> 1584 bytes
web/www/routino/icons/limit-29.png | Bin 723 -> 1343 bytes
web/www/routino/icons/limit-3.0.png | Bin 712 -> 1386 bytes
web/www/routino/icons/limit-3.1.png | Bin 692 -> 1298 bytes
web/www/routino/icons/limit-3.2.png | Bin 730 -> 1401 bytes
web/www/routino/icons/limit-3.3.png | Bin 676 -> 1275 bytes
web/www/routino/icons/limit-3.4.png | Bin 702 -> 1348 bytes
web/www/routino/icons/limit-3.5.png | Bin 760 -> 1405 bytes
web/www/routino/icons/limit-3.6.png | Bin 725 -> 1388 bytes
web/www/routino/icons/limit-3.7.png | Bin 746 -> 1297 bytes
web/www/routino/icons/limit-3.8.png | Bin 723 -> 1370 bytes
web/www/routino/icons/limit-3.9.png | Bin 725 -> 1375 bytes
web/www/routino/icons/limit-3.png | Bin 593 -> 1071 bytes
web/www/routino/icons/limit-30.0.png | Bin 796 -> 1587 bytes
web/www/routino/icons/limit-30.1.png | Bin 781 -> 1524 bytes
web/www/routino/icons/limit-30.2.png | Bin 856 -> 1571 bytes
web/www/routino/icons/limit-30.3.png | Bin 835 -> 1550 bytes
web/www/routino/icons/limit-30.4.png | Bin 795 -> 1559 bytes
web/www/routino/icons/limit-30.5.png | Bin 839 -> 1592 bytes
web/www/routino/icons/limit-30.6.png | Bin 833 -> 1569 bytes
web/www/routino/icons/limit-30.7.png | Bin 838 -> 1558 bytes
web/www/routino/icons/limit-30.8.png | Bin 846 -> 1622 bytes
web/www/routino/icons/limit-30.9.png | Bin 835 -> 1566 bytes
web/www/routino/icons/limit-30.png | Bin 694 -> 1362 bytes
web/www/routino/icons/limit-31.0.png | Bin 815 -> 1509 bytes
web/www/routino/icons/limit-31.1.png | Bin 761 -> 1438 bytes
web/www/routino/icons/limit-31.2.png | Bin 830 -> 1527 bytes
web/www/routino/icons/limit-31.3.png | Bin 820 -> 1475 bytes
web/www/routino/icons/limit-31.4.png | Bin 775 -> 1489 bytes
web/www/routino/icons/limit-31.5.png | Bin 833 -> 1547 bytes
web/www/routino/icons/limit-31.6.png | Bin 832 -> 1516 bytes
web/www/routino/icons/limit-31.7.png | Bin 816 -> 1459 bytes
web/www/routino/icons/limit-31.8.png | Bin 830 -> 1523 bytes
web/www/routino/icons/limit-31.9.png | Bin 814 -> 1513 bytes
web/www/routino/icons/limit-31.png | Bin 677 -> 1279 bytes
web/www/routino/icons/limit-32.0.png | Bin 861 -> 1592 bytes
web/www/routino/icons/limit-32.1.png | Bin 826 -> 1519 bytes
web/www/routino/icons/limit-32.2.png | Bin 856 -> 1573 bytes
web/www/routino/icons/limit-32.3.png | Bin 851 -> 1596 bytes
web/www/routino/icons/limit-32.4.png | Bin 819 -> 1566 bytes
web/www/routino/icons/limit-32.5.png | Bin 865 -> 1611 bytes
web/www/routino/icons/limit-32.6.png | Bin 868 -> 1591 bytes
web/www/routino/icons/limit-32.7.png | Bin 833 -> 1555 bytes
web/www/routino/icons/limit-32.8.png | Bin 847 -> 1595 bytes
web/www/routino/icons/limit-32.9.png | Bin 870 -> 1613 bytes
web/www/routino/icons/limit-32.png | Bin 715 -> 1372 bytes
web/www/routino/icons/limit-33.0.png | Bin 844 -> 1596 bytes
web/www/routino/icons/limit-33.1.png | Bin 806 -> 1542 bytes
web/www/routino/icons/limit-33.2.png | Bin 837 -> 1575 bytes
web/www/routino/icons/limit-33.3.png | Bin 827 -> 1552 bytes
web/www/routino/icons/limit-33.4.png | Bin 795 -> 1569 bytes
web/www/routino/icons/limit-33.5.png | Bin 838 -> 1596 bytes
web/www/routino/icons/limit-33.6.png | Bin 854 -> 1565 bytes
web/www/routino/icons/limit-33.7.png | Bin 821 -> 1552 bytes
web/www/routino/icons/limit-33.8.png | Bin 843 -> 1573 bytes
web/www/routino/icons/limit-33.9.png | Bin 855 -> 1581 bytes
web/www/routino/icons/limit-33.png | Bin 709 -> 1337 bytes
web/www/routino/icons/limit-34.0.png | Bin 803 -> 1541 bytes
web/www/routino/icons/limit-34.1.png | Bin 762 -> 1464 bytes
web/www/routino/icons/limit-34.2.png | Bin 800 -> 1502 bytes
web/www/routino/icons/limit-34.3.png | Bin 794 -> 1515 bytes
web/www/routino/icons/limit-34.4.png | Bin 769 -> 1520 bytes
web/www/routino/icons/limit-34.5.png | Bin 832 -> 1518 bytes
web/www/routino/icons/limit-34.6.png | Bin 810 -> 1529 bytes
web/www/routino/icons/limit-34.7.png | Bin 821 -> 1467 bytes
web/www/routino/icons/limit-34.8.png | Bin 813 -> 1540 bytes
web/www/routino/icons/limit-34.9.png | Bin 804 -> 1539 bytes
web/www/routino/icons/limit-34.png | Bin 680 -> 1282 bytes
web/www/routino/icons/limit-35.0.png | Bin 845 -> 1550 bytes
web/www/routino/icons/limit-35.1.png | Bin 824 -> 1545 bytes
web/www/routino/icons/limit-35.2.png | Bin 846 -> 1539 bytes
web/www/routino/icons/limit-35.3.png | Bin 841 -> 1563 bytes
web/www/routino/icons/limit-35.4.png | Bin 830 -> 1565 bytes
web/www/routino/icons/limit-35.5.png | Bin 839 -> 1617 bytes
web/www/routino/icons/limit-35.6.png | Bin 848 -> 1570 bytes
web/www/routino/icons/limit-35.7.png | Bin 837 -> 1520 bytes
web/www/routino/icons/limit-35.8.png | Bin 858 -> 1587 bytes
web/www/routino/icons/limit-35.9.png | Bin 848 -> 1560 bytes
web/www/routino/icons/limit-35.png | Bin 747 -> 1327 bytes
web/www/routino/icons/limit-36.0.png | Bin 839 -> 1596 bytes
web/www/routino/icons/limit-36.1.png | Bin 816 -> 1538 bytes
web/www/routino/icons/limit-36.2.png | Bin 852 -> 1558 bytes
web/www/routino/icons/limit-36.3.png | Bin 835 -> 1552 bytes
web/www/routino/icons/limit-36.4.png | Bin 802 -> 1554 bytes
web/www/routino/icons/limit-36.5.png | Bin 845 -> 1603 bytes
web/www/routino/icons/limit-36.6.png | Bin 841 -> 1589 bytes
web/www/routino/icons/limit-36.7.png | Bin 842 -> 1574 bytes
web/www/routino/icons/limit-36.8.png | Bin 852 -> 1598 bytes
web/www/routino/icons/limit-36.9.png | Bin 850 -> 1583 bytes
web/www/routino/icons/limit-36.png | Bin 716 -> 1342 bytes
web/www/routino/icons/limit-37.0.png | Bin 825 -> 1557 bytes
web/www/routino/icons/limit-37.1.png | Bin 806 -> 1502 bytes
web/www/routino/icons/limit-37.2.png | Bin 826 -> 1539 bytes
web/www/routino/icons/limit-37.3.png | Bin 821 -> 1527 bytes
web/www/routino/icons/limit-37.4.png | Bin 803 -> 1529 bytes
web/www/routino/icons/limit-37.5.png | Bin 826 -> 1569 bytes
web/www/routino/icons/limit-37.6.png | Bin 845 -> 1557 bytes
web/www/routino/icons/limit-37.7.png | Bin 810 -> 1543 bytes
web/www/routino/icons/limit-37.8.png | Bin 840 -> 1585 bytes
web/www/routino/icons/limit-37.9.png | Bin 831 -> 1560 bytes
web/www/routino/icons/limit-37.png | Bin 722 -> 1313 bytes
web/www/routino/icons/limit-38.0.png | Bin 851 -> 1595 bytes
web/www/routino/icons/limit-38.1.png | Bin 821 -> 1542 bytes
web/www/routino/icons/limit-38.2.png | Bin 850 -> 1606 bytes
web/www/routino/icons/limit-38.3.png | Bin 837 -> 1580 bytes
web/www/routino/icons/limit-38.4.png | Bin 814 -> 1564 bytes
web/www/routino/icons/limit-38.5.png | Bin 847 -> 1618 bytes
web/www/routino/icons/limit-38.6.png | Bin 848 -> 1580 bytes
web/www/routino/icons/limit-38.7.png | Bin 844 -> 1581 bytes
web/www/routino/icons/limit-38.8.png | Bin 830 -> 1573 bytes
web/www/routino/icons/limit-38.9.png | Bin 856 -> 1593 bytes
web/www/routino/icons/limit-38.png | Bin 707 -> 1363 bytes
web/www/routino/icons/limit-39.0.png | Bin 822 -> 1594 bytes
web/www/routino/icons/limit-39.1.png | Bin 801 -> 1512 bytes
web/www/routino/icons/limit-39.2.png | Bin 856 -> 1568 bytes
web/www/routino/icons/limit-39.3.png | Bin 844 -> 1571 bytes
web/www/routino/icons/limit-39.4.png | Bin 797 -> 1569 bytes
web/www/routino/icons/limit-39.5.png | Bin 843 -> 1609 bytes
web/www/routino/icons/limit-39.6.png | Bin 848 -> 1579 bytes
web/www/routino/icons/limit-39.7.png | Bin 832 -> 1546 bytes
web/www/routino/icons/limit-39.8.png | Bin 861 -> 1595 bytes
web/www/routino/icons/limit-39.9.png | Bin 842 -> 1580 bytes
web/www/routino/icons/limit-39.png | Bin 700 -> 1316 bytes
web/www/routino/icons/limit-4.0.png | Bin 699 -> 1344 bytes
web/www/routino/icons/limit-4.1.png | Bin 661 -> 1288 bytes
web/www/routino/icons/limit-4.2.png | Bin 713 -> 1337 bytes
web/www/routino/icons/limit-4.3.png | Bin 704 -> 1344 bytes
web/www/routino/icons/limit-4.4.png | Bin 638 -> 1249 bytes
web/www/routino/icons/limit-4.5.png | Bin 705 -> 1365 bytes
web/www/routino/icons/limit-4.6.png | Bin 702 -> 1352 bytes
web/www/routino/icons/limit-4.7.png | Bin 709 -> 1244 bytes
web/www/routino/icons/limit-4.8.png | Bin 709 -> 1357 bytes
web/www/routino/icons/limit-4.9.png | Bin 707 -> 1355 bytes
web/www/routino/icons/limit-4.png | Bin 566 -> 1049 bytes
web/www/routino/icons/limit-40.0.png | Bin 776 -> 1543 bytes
web/www/routino/icons/limit-40.png | Bin 670 -> 1299 bytes
web/www/routino/icons/limit-41.png | Bin 616 -> 1171 bytes
web/www/routino/icons/limit-42.png | Bin 680 -> 1304 bytes
web/www/routino/icons/limit-43.png | Bin 671 -> 1295 bytes
web/www/routino/icons/limit-44.png | Bin 616 -> 1197 bytes
web/www/routino/icons/limit-45.png | Bin 680 -> 1269 bytes
web/www/routino/icons/limit-46.png | Bin 671 -> 1299 bytes
web/www/routino/icons/limit-47.png | Bin 683 -> 1228 bytes
web/www/routino/icons/limit-48.png | Bin 678 -> 1325 bytes
web/www/routino/icons/limit-49.png | Bin 670 -> 1300 bytes
web/www/routino/icons/limit-5.0.png | Bin 754 -> 1376 bytes
web/www/routino/icons/limit-5.1.png | Bin 737 -> 1354 bytes
web/www/routino/icons/limit-5.2.png | Bin 771 -> 1433 bytes
web/www/routino/icons/limit-5.3.png | Bin 764 -> 1392 bytes
web/www/routino/icons/limit-5.4.png | Bin 711 -> 1370 bytes
web/www/routino/icons/limit-5.5.png | Bin 727 -> 1413 bytes
web/www/routino/icons/limit-5.6.png | Bin 763 -> 1415 bytes
web/www/routino/icons/limit-5.7.png | Bin 743 -> 1411 bytes
web/www/routino/icons/limit-5.8.png | Bin 767 -> 1394 bytes
web/www/routino/icons/limit-5.9.png | Bin 765 -> 1379 bytes
web/www/routino/icons/limit-5.png | Bin 614 -> 1156 bytes
web/www/routino/icons/limit-50.png | Bin 692 -> 1367 bytes
web/www/routino/icons/limit-51.png | Bin 711 -> 1287 bytes
web/www/routino/icons/limit-52.png | Bin 758 -> 1338 bytes
web/www/routino/icons/limit-53.png | Bin 745 -> 1312 bytes
web/www/routino/icons/limit-54.png | Bin 694 -> 1336 bytes
web/www/routino/icons/limit-55.png | Bin 744 -> 1357 bytes
web/www/routino/icons/limit-56.png | Bin 732 -> 1360 bytes
web/www/routino/icons/limit-57.png | Bin 710 -> 1367 bytes
web/www/routino/icons/limit-58.png | Bin 742 -> 1416 bytes
web/www/routino/icons/limit-59.png | Bin 724 -> 1339 bytes
web/www/routino/icons/limit-6.0.png | Bin 702 -> 1350 bytes
web/www/routino/icons/limit-6.1.png | Bin 688 -> 1326 bytes
web/www/routino/icons/limit-6.2.png | Bin 740 -> 1396 bytes
web/www/routino/icons/limit-6.3.png | Bin 720 -> 1375 bytes
web/www/routino/icons/limit-6.4.png | Bin 697 -> 1329 bytes
web/www/routino/icons/limit-6.5.png | Bin 746 -> 1369 bytes
web/www/routino/icons/limit-6.6.png | Bin 670 -> 1325 bytes
web/www/routino/icons/limit-6.7.png | Bin 745 -> 1344 bytes
web/www/routino/icons/limit-6.8.png | Bin 709 -> 1376 bytes
web/www/routino/icons/limit-6.9.png | Bin 714 -> 1361 bytes
web/www/routino/icons/limit-6.png | Bin 586 -> 1111 bytes
web/www/routino/icons/limit-60.png | Bin 686 -> 1315 bytes
web/www/routino/icons/limit-61.png | Bin 674 -> 1269 bytes
web/www/routino/icons/limit-62.png | Bin 725 -> 1285 bytes
web/www/routino/icons/limit-63.png | Bin 715 -> 1289 bytes
web/www/routino/icons/limit-64.png | Bin 684 -> 1250 bytes
web/www/routino/icons/limit-65.png | Bin 733 -> 1320 bytes
web/www/routino/icons/limit-66.png | Bin 698 -> 1330 bytes
web/www/routino/icons/limit-67.png | Bin 725 -> 1255 bytes
web/www/routino/icons/limit-68.png | Bin 715 -> 1301 bytes
web/www/routino/icons/limit-69.png | Bin 696 -> 1311 bytes
web/www/routino/icons/limit-7.0.png | Bin 747 -> 1310 bytes
web/www/routino/icons/limit-7.1.png | Bin 728 -> 1237 bytes
web/www/routino/icons/limit-7.2.png | Bin 743 -> 1293 bytes
web/www/routino/icons/limit-7.3.png | Bin 749 -> 1311 bytes
web/www/routino/icons/limit-7.4.png | Bin 720 -> 1245 bytes
web/www/routino/icons/limit-7.5.png | Bin 745 -> 1348 bytes
web/www/routino/icons/limit-7.6.png | Bin 754 -> 1336 bytes
web/www/routino/icons/limit-7.7.png | Bin 679 -> 1164 bytes
web/www/routino/icons/limit-7.8.png | Bin 749 -> 1343 bytes
web/www/routino/icons/limit-7.9.png | Bin 749 -> 1277 bytes
web/www/routino/icons/limit-7.png | Bin 615 -> 1021 bytes
web/www/routino/icons/limit-70.png | Bin 703 -> 1269 bytes
web/www/routino/icons/limit-71.png | Bin 676 -> 1186 bytes
web/www/routino/icons/limit-72.png | Bin 720 -> 1250 bytes
web/www/routino/icons/limit-73.png | Bin 734 -> 1251 bytes
web/www/routino/icons/limit-74.png | Bin 691 -> 1189 bytes
web/www/routino/icons/limit-75.png | Bin 707 -> 1287 bytes
web/www/routino/icons/limit-76.png | Bin 754 -> 1302 bytes
web/www/routino/icons/limit-77.png | Bin 667 -> 1173 bytes
web/www/routino/icons/limit-78.png | Bin 718 -> 1285 bytes
web/www/routino/icons/limit-79.png | Bin 725 -> 1287 bytes
web/www/routino/icons/limit-8.0.png | Bin 719 -> 1375 bytes
web/www/routino/icons/limit-8.1.png | Bin 694 -> 1339 bytes
web/www/routino/icons/limit-8.2.png | Bin 734 -> 1360 bytes
web/www/routino/icons/limit-8.3.png | Bin 727 -> 1355 bytes
web/www/routino/icons/limit-8.4.png | Bin 711 -> 1380 bytes
web/www/routino/icons/limit-8.5.png | Bin 759 -> 1456 bytes
web/www/routino/icons/limit-8.6.png | Bin 714 -> 1409 bytes
web/www/routino/icons/limit-8.7.png | Bin 754 -> 1356 bytes
web/www/routino/icons/limit-8.8.png | Bin 671 -> 1304 bytes
web/www/routino/icons/limit-8.9.png | Bin 729 -> 1392 bytes
web/www/routino/icons/limit-8.png | Bin 609 -> 1128 bytes
web/www/routino/icons/limit-80.png | Bin 693 -> 1278 bytes
web/www/routino/icons/limit-81.png | Bin 677 -> 1279 bytes
web/www/routino/icons/limit-82.png | Bin 721 -> 1369 bytes
web/www/routino/icons/limit-83.png | Bin 692 -> 1319 bytes
web/www/routino/icons/limit-84.png | Bin 688 -> 1288 bytes
web/www/routino/icons/limit-85.png | Bin 731 -> 1344 bytes
web/www/routino/icons/limit-86.png | Bin 698 -> 1319 bytes
web/www/routino/icons/limit-87.png | Bin 708 -> 1311 bytes
web/www/routino/icons/limit-88.png | Bin 691 -> 1297 bytes
web/www/routino/icons/limit-89.png | Bin 700 -> 1326 bytes
web/www/routino/icons/limit-9.0.png | Bin 718 -> 1391 bytes
web/www/routino/icons/limit-9.1.png | Bin 697 -> 1320 bytes
web/www/routino/icons/limit-9.2.png | Bin 740 -> 1388 bytes
web/www/routino/icons/limit-9.3.png | Bin 731 -> 1364 bytes
web/www/routino/icons/limit-9.4.png | Bin 710 -> 1357 bytes
web/www/routino/icons/limit-9.5.png | Bin 762 -> 1403 bytes
web/www/routino/icons/limit-9.6.png | Bin 725 -> 1417 bytes
web/www/routino/icons/limit-9.7.png | Bin 750 -> 1293 bytes
web/www/routino/icons/limit-9.8.png | Bin 737 -> 1379 bytes
web/www/routino/icons/limit-9.9.png | Bin 667 -> 1317 bytes
web/www/routino/icons/limit-9.png | Bin 595 -> 1072 bytes
web/www/routino/icons/limit-90.png | Bin 691 -> 1296 bytes
web/www/routino/icons/limit-91.png | Bin 676 -> 1287 bytes
web/www/routino/icons/limit-92.png | Bin 708 -> 1300 bytes
web/www/routino/icons/limit-93.png | Bin 685 -> 1300 bytes
web/www/routino/icons/limit-94.png | Bin 689 -> 1250 bytes
web/www/routino/icons/limit-95.png | Bin 733 -> 1333 bytes
web/www/routino/icons/limit-96.png | Bin 698 -> 1329 bytes
web/www/routino/icons/limit-97.png | Bin 724 -> 1276 bytes
web/www/routino/icons/limit-98.png | Bin 699 -> 1320 bytes
web/www/routino/icons/limit-99.png | Bin 684 -> 1305 bytes
web/www/routino/icons/limit-no.png | Bin 448 -> 759 bytes
web/www/routino/icons/marker-1-grey.png | Bin 1198 -> 2802 bytes
web/www/routino/icons/marker-1-red.png | Bin 926 -> 1976 bytes
web/www/routino/icons/marker-10-grey.png | Bin 1387 -> 3118 bytes
web/www/routino/icons/marker-10-red.png | Bin 1037 -> 2104 bytes
web/www/routino/icons/marker-11-grey.png | Bin 1241 -> 2979 bytes
web/www/routino/icons/marker-11-red.png | Bin 966 -> 2029 bytes
web/www/routino/icons/marker-12-grey.png | Bin 1401 -> 3170 bytes
web/www/routino/icons/marker-12-red.png | Bin 1065 -> 2129 bytes
web/www/routino/icons/marker-13-grey.png | Bin 1401 -> 3196 bytes
web/www/routino/icons/marker-13-red.png | Bin 1046 -> 2100 bytes
web/www/routino/icons/marker-14-grey.png | Bin 1321 -> 3073 bytes
web/www/routino/icons/marker-14-red.png | Bin 1050 -> 2115 bytes
web/www/routino/icons/marker-15-grey.png | Bin 1418 -> 3162 bytes
web/www/routino/icons/marker-15-red.png | Bin 1080 -> 2121 bytes
web/www/routino/icons/marker-16-grey.png | Bin 1410 -> 3117 bytes
web/www/routino/icons/marker-16-red.png | Bin 1056 -> 2142 bytes
web/www/routino/icons/marker-17-grey.png | Bin 1358 -> 3170 bytes
web/www/routino/icons/marker-17-red.png | Bin 1056 -> 2102 bytes
web/www/routino/icons/marker-18-grey.png | Bin 1416 -> 3124 bytes
web/www/routino/icons/marker-18-red.png | Bin 1053 -> 2122 bytes
web/www/routino/icons/marker-19-grey.png | Bin 1396 -> 3153 bytes
web/www/routino/icons/marker-19-red.png | Bin 1049 -> 2107 bytes
web/www/routino/icons/marker-2-grey.png | Bin 1358 -> 3034 bytes
web/www/routino/icons/marker-2-red.png | Bin 1015 -> 2069 bytes
web/www/routino/icons/marker-20-grey.png | Bin 1496 -> 3229 bytes
web/www/routino/icons/marker-20-red.png | Bin 1106 -> 2212 bytes
web/www/routino/icons/marker-21-grey.png | Bin 1404 -> 3168 bytes
web/www/routino/icons/marker-21-red.png | Bin 1063 -> 2163 bytes
web/www/routino/icons/marker-22-grey.png | Bin 1421 -> 3251 bytes
web/www/routino/icons/marker-22-red.png | Bin 1069 -> 2192 bytes
web/www/routino/icons/marker-23-grey.png | Bin 1511 -> 3243 bytes
web/www/routino/icons/marker-23-red.png | Bin 1121 -> 2199 bytes
web/www/routino/icons/marker-24-grey.png | Bin 1451 -> 3241 bytes
web/www/routino/icons/marker-24-red.png | Bin 1095 -> 2181 bytes
web/www/routino/icons/marker-25-grey.png | Bin 1508 -> 3296 bytes
web/www/routino/icons/marker-25-red.png | Bin 1154 -> 2239 bytes
web/www/routino/icons/marker-26-grey.png | Bin 1511 -> 3311 bytes
web/www/routino/icons/marker-26-red.png | Bin 1104 -> 2240 bytes
web/www/routino/icons/marker-27-grey.png | Bin 1468 -> 3255 bytes
web/www/routino/icons/marker-27-red.png | Bin 1108 -> 2194 bytes
web/www/routino/icons/marker-28-grey.png | Bin 1512 -> 3234 bytes
web/www/routino/icons/marker-28-red.png | Bin 1124 -> 2208 bytes
web/www/routino/icons/marker-29-grey.png | Bin 1503 -> 3263 bytes
web/www/routino/icons/marker-29-red.png | Bin 1087 -> 2195 bytes
web/www/routino/icons/marker-3-grey.png | Bin 1358 -> 3102 bytes
web/www/routino/icons/marker-3-red.png | Bin 1007 -> 2096 bytes
web/www/routino/icons/marker-30-grey.png | Bin 1471 -> 3259 bytes
web/www/routino/icons/marker-30-red.png | Bin 1084 -> 2187 bytes
web/www/routino/icons/marker-31-grey.png | Bin 1411 -> 3215 bytes
web/www/routino/icons/marker-31-red.png | Bin 1063 -> 2134 bytes
web/www/routino/icons/marker-32-grey.png | Bin 1485 -> 3333 bytes
web/www/routino/icons/marker-32-red.png | Bin 1108 -> 2205 bytes
web/www/routino/icons/marker-33-grey.png | Bin 1463 -> 3284 bytes
web/www/routino/icons/marker-33-red.png | Bin 1081 -> 2147 bytes
web/www/routino/icons/marker-34-grey.png | Bin 1456 -> 3241 bytes
web/www/routino/icons/marker-34-red.png | Bin 1076 -> 2185 bytes
web/www/routino/icons/marker-35-grey.png | Bin 1496 -> 3276 bytes
web/www/routino/icons/marker-35-red.png | Bin 1118 -> 2189 bytes
web/www/routino/icons/marker-36-grey.png | Bin 1501 -> 3252 bytes
web/www/routino/icons/marker-36-red.png | Bin 1087 -> 2194 bytes
web/www/routino/icons/marker-37-grey.png | Bin 1457 -> 3270 bytes
web/www/routino/icons/marker-37-red.png | Bin 1094 -> 2186 bytes
web/www/routino/icons/marker-38-grey.png | Bin 1498 -> 3263 bytes
web/www/routino/icons/marker-38-red.png | Bin 1097 -> 2201 bytes
web/www/routino/icons/marker-39-grey.png | Bin 1498 -> 3288 bytes
web/www/routino/icons/marker-39-red.png | Bin 1086 -> 2179 bytes
web/www/routino/icons/marker-4-grey.png | Bin 1282 -> 2981 bytes
web/www/routino/icons/marker-4-red.png | Bin 994 -> 2021 bytes
web/www/routino/icons/marker-40-grey.png | Bin 1442 -> 3186 bytes
web/www/routino/icons/marker-40-red.png | Bin 1061 -> 2139 bytes
web/www/routino/icons/marker-41-grey.png | Bin 1358 -> 3100 bytes
web/www/routino/icons/marker-41-red.png | Bin 1040 -> 2102 bytes
web/www/routino/icons/marker-42-grey.png | Bin 1422 -> 3227 bytes
web/www/routino/icons/marker-42-red.png | Bin 1096 -> 2175 bytes
web/www/routino/icons/marker-43-grey.png | Bin 1462 -> 3200 bytes
web/www/routino/icons/marker-43-red.png | Bin 1068 -> 2146 bytes
web/www/routino/icons/marker-44-grey.png | Bin 1344 -> 3140 bytes
web/www/routino/icons/marker-44-red.png | Bin 1026 -> 2071 bytes
web/www/routino/icons/marker-45-grey.png | Bin 1459 -> 3270 bytes
web/www/routino/icons/marker-45-red.png | Bin 1107 -> 2160 bytes
web/www/routino/icons/marker-46-grey.png | Bin 1456 -> 3186 bytes
web/www/routino/icons/marker-46-red.png | Bin 1072 -> 2158 bytes
web/www/routino/icons/marker-47-grey.png | Bin 1418 -> 3196 bytes
web/www/routino/icons/marker-47-red.png | Bin 1080 -> 2145 bytes
web/www/routino/icons/marker-48-grey.png | Bin 1477 -> 3201 bytes
web/www/routino/icons/marker-48-red.png | Bin 1075 -> 2179 bytes
web/www/routino/icons/marker-49-grey.png | Bin 1458 -> 3224 bytes
web/www/routino/icons/marker-49-red.png | Bin 1069 -> 2154 bytes
web/www/routino/icons/marker-5-grey.png | Bin 1360 -> 3170 bytes
web/www/routino/icons/marker-5-red.png | Bin 992 -> 2105 bytes
web/www/routino/icons/marker-50-grey.png | Bin 1474 -> 3224 bytes
web/www/routino/icons/marker-50-red.png | Bin 1109 -> 2189 bytes
web/www/routino/icons/marker-51-grey.png | Bin 1414 -> 3170 bytes
web/www/routino/icons/marker-51-red.png | Bin 1081 -> 2163 bytes
web/www/routino/icons/marker-52-grey.png | Bin 1504 -> 3289 bytes
web/www/routino/icons/marker-52-red.png | Bin 1134 -> 2211 bytes
web/www/routino/icons/marker-53-grey.png | Bin 1500 -> 3273 bytes
web/www/routino/icons/marker-53-red.png | Bin 1105 -> 2231 bytes
web/www/routino/icons/marker-54-grey.png | Bin 1451 -> 3232 bytes
web/www/routino/icons/marker-54-red.png | Bin 1104 -> 2170 bytes
web/www/routino/icons/marker-55-grey.png | Bin 1457 -> 3291 bytes
web/www/routino/icons/marker-55-red.png | Bin 1088 -> 2164 bytes
web/www/routino/icons/marker-56-grey.png | Bin 1500 -> 3286 bytes
web/www/routino/icons/marker-56-red.png | Bin 1123 -> 2208 bytes
web/www/routino/icons/marker-57-grey.png | Bin 1455 -> 3244 bytes
web/www/routino/icons/marker-57-red.png | Bin 1099 -> 2117 bytes
web/www/routino/icons/marker-58-grey.png | Bin 1497 -> 3252 bytes
web/www/routino/icons/marker-58-red.png | Bin 1113 -> 2226 bytes
web/www/routino/icons/marker-59-grey.png | Bin 1501 -> 3268 bytes
web/www/routino/icons/marker-59-red.png | Bin 1114 -> 2187 bytes
web/www/routino/icons/marker-6-grey.png | Bin 1347 -> 3075 bytes
web/www/routino/icons/marker-6-red.png | Bin 1000 -> 2087 bytes
web/www/routino/icons/marker-60-grey.png | Bin 1475 -> 3221 bytes
web/www/routino/icons/marker-60-red.png | Bin 1094 -> 2179 bytes
web/www/routino/icons/marker-61-grey.png | Bin 1400 -> 3185 bytes
web/www/routino/icons/marker-61-red.png | Bin 1067 -> 2151 bytes
web/www/routino/icons/marker-62-grey.png | Bin 1487 -> 3294 bytes
web/www/routino/icons/marker-62-red.png | Bin 1117 -> 2236 bytes
web/www/routino/icons/marker-63-grey.png | Bin 1485 -> 3271 bytes
web/www/routino/icons/marker-63-red.png | Bin 1088 -> 2205 bytes
web/www/routino/icons/marker-64-grey.png | Bin 1435 -> 3218 bytes
web/www/routino/icons/marker-64-red.png | Bin 1095 -> 2203 bytes
web/www/routino/icons/marker-65-grey.png | Bin 1491 -> 3296 bytes
web/www/routino/icons/marker-65-red.png | Bin 1130 -> 2212 bytes
web/www/routino/icons/marker-66-grey.png | Bin 1461 -> 3241 bytes
web/www/routino/icons/marker-66-red.png | Bin 1082 -> 2165 bytes
web/www/routino/icons/marker-67-grey.png | Bin 1451 -> 3301 bytes
web/www/routino/icons/marker-67-red.png | Bin 1104 -> 2164 bytes
web/www/routino/icons/marker-68-grey.png | Bin 1491 -> 3242 bytes
web/www/routino/icons/marker-68-red.png | Bin 1107 -> 2185 bytes
web/www/routino/icons/marker-69-grey.png | Bin 1494 -> 3291 bytes
web/www/routino/icons/marker-69-red.png | Bin 1101 -> 2179 bytes
web/www/routino/icons/marker-7-grey.png | Bin 1282 -> 3100 bytes
web/www/routino/icons/marker-7-red.png | Bin 968 -> 2027 bytes
web/www/routino/icons/marker-70-grey.png | Bin 1453 -> 3190 bytes
web/www/routino/icons/marker-70-red.png | Bin 1101 -> 2145 bytes
web/www/routino/icons/marker-71-grey.png | Bin 1358 -> 3168 bytes
web/www/routino/icons/marker-71-red.png | Bin 1074 -> 2113 bytes
web/www/routino/icons/marker-72-grey.png | Bin 1459 -> 3265 bytes
web/www/routino/icons/marker-72-red.png | Bin 1108 -> 2149 bytes
web/www/routino/icons/marker-73-grey.png | Bin 1444 -> 3276 bytes
web/www/routino/icons/marker-73-red.png | Bin 1094 -> 2114 bytes
web/www/routino/icons/marker-74-grey.png | Bin 1425 -> 3212 bytes
web/www/routino/icons/marker-74-red.png | Bin 1095 -> 2132 bytes
web/www/routino/icons/marker-75-grey.png | Bin 1457 -> 3261 bytes
web/www/routino/icons/marker-75-red.png | Bin 1110 -> 2112 bytes
web/www/routino/icons/marker-76-grey.png | Bin 1463 -> 3234 bytes
web/www/routino/icons/marker-76-red.png | Bin 1112 -> 2184 bytes
web/www/routino/icons/marker-77-grey.png | Bin 1343 -> 3156 bytes
web/www/routino/icons/marker-77-red.png | Bin 1027 -> 2090 bytes
web/www/routino/icons/marker-78-grey.png | Bin 1476 -> 3236 bytes
web/www/routino/icons/marker-78-red.png | Bin 1109 -> 2204 bytes
web/www/routino/icons/marker-79-grey.png | Bin 1472 -> 3271 bytes
web/www/routino/icons/marker-79-red.png | Bin 1104 -> 2141 bytes
web/www/routino/icons/marker-8-grey.png | Bin 1339 -> 3116 bytes
web/www/routino/icons/marker-8-red.png | Bin 1024 -> 2086 bytes
web/www/routino/icons/marker-80-grey.png | Bin 1486 -> 3216 bytes
web/www/routino/icons/marker-80-red.png | Bin 1094 -> 2195 bytes
web/www/routino/icons/marker-81-grey.png | Bin 1404 -> 3154 bytes
web/www/routino/icons/marker-81-red.png | Bin 1076 -> 2160 bytes
web/www/routino/icons/marker-82-grey.png | Bin 1481 -> 3237 bytes
web/www/routino/icons/marker-82-red.png | Bin 1113 -> 2227 bytes
web/www/routino/icons/marker-83-grey.png | Bin 1496 -> 3262 bytes
web/www/routino/icons/marker-83-red.png | Bin 1099 -> 2210 bytes
web/www/routino/icons/marker-84-grey.png | Bin 1452 -> 3232 bytes
web/www/routino/icons/marker-84-red.png | Bin 1081 -> 2207 bytes
web/www/routino/icons/marker-85-grey.png | Bin 1512 -> 3309 bytes
web/www/routino/icons/marker-85-red.png | Bin 1127 -> 2225 bytes
web/www/routino/icons/marker-86-grey.png | Bin 1493 -> 3278 bytes
web/www/routino/icons/marker-86-red.png | Bin 1108 -> 2257 bytes
web/www/routino/icons/marker-87-grey.png | Bin 1474 -> 3238 bytes
web/www/routino/icons/marker-87-red.png | Bin 1095 -> 2184 bytes
web/www/routino/icons/marker-88-grey.png | Bin 1460 -> 3213 bytes
web/www/routino/icons/marker-88-red.png | Bin 1082 -> 2172 bytes
web/www/routino/icons/marker-89-grey.png | Bin 1501 -> 3250 bytes
web/www/routino/icons/marker-89-red.png | Bin 1097 -> 2205 bytes
web/www/routino/icons/marker-9-grey.png | Bin 1355 -> 3123 bytes
web/www/routino/icons/marker-9-red.png | Bin 997 -> 2087 bytes
web/www/routino/icons/marker-90-grey.png | Bin 1457 -> 3212 bytes
web/www/routino/icons/marker-90-red.png | Bin 1083 -> 2184 bytes
web/www/routino/icons/marker-91-grey.png | Bin 1398 -> 3153 bytes
web/www/routino/icons/marker-91-red.png | Bin 1062 -> 2147 bytes
web/www/routino/icons/marker-92-grey.png | Bin 1485 -> 3270 bytes
web/www/routino/icons/marker-92-red.png | Bin 1110 -> 2204 bytes
web/www/routino/icons/marker-93-grey.png | Bin 1494 -> 3256 bytes
web/www/routino/icons/marker-93-red.png | Bin 1089 -> 2169 bytes
web/www/routino/icons/marker-94-grey.png | Bin 1449 -> 3248 bytes
web/www/routino/icons/marker-94-red.png | Bin 1074 -> 2179 bytes
web/www/routino/icons/marker-95-grey.png | Bin 1496 -> 3305 bytes
web/www/routino/icons/marker-95-red.png | Bin 1127 -> 2178 bytes
web/www/routino/icons/marker-96-grey.png | Bin 1493 -> 3252 bytes
web/www/routino/icons/marker-96-red.png | Bin 1105 -> 2179 bytes
web/www/routino/icons/marker-97-grey.png | Bin 1444 -> 3215 bytes
web/www/routino/icons/marker-97-red.png | Bin 1088 -> 2162 bytes
web/www/routino/icons/marker-98-grey.png | Bin 1499 -> 3252 bytes
web/www/routino/icons/marker-98-red.png | Bin 1111 -> 2209 bytes
web/www/routino/icons/marker-99-grey.png | Bin 1444 -> 3241 bytes
web/www/routino/icons/marker-99-red.png | Bin 1063 -> 2140 bytes
web/www/routino/icons/marker-XXX-grey.png | Bin 1350 -> 3081 bytes
web/www/routino/icons/marker-XXX-red.png | Bin 1006 -> 2064 bytes
web/www/routino/icons/marker-home-grey.png | Bin 1461 -> 3229 bytes
web/www/routino/icons/marker-home-red.png | Bin 1091 -> 2170 bytes
web/www/routino/mapprops.js | 13 ---
web/www/routino/results.cgi | 4 +-
web/www/routino/router.cgi | 4 +-
web/www/routino/router.css | 18 ++-
web/www/routino/router.html.de | 24 ++--
web/www/routino/router.html.en | 24 ++--
web/www/routino/router.html.fr | 24 ++--
web/www/routino/router.html.hu | 24 ++--
web/www/routino/router.html.nl | 24 ++--
web/www/routino/router.html.pl | 36 +++---
web/www/routino/router.html.ru | 180 +++++++++++++++--------------
web/www/routino/router.leaflet.js | 16 ++-
web/www/routino/router.openlayers.js | 16 ++-
web/www/routino/router.pl | 6 +-
web/www/routino/search.cgi | 4 +-
web/www/routino/search.pl | 4 +-
web/www/routino/statistics.cgi | 4 +-
web/www/routino/update-profiles.pl | 4 +-
web/www/routino/visualiser.cgi | 4 +-
web/www/routino/visualiser.html.de | 20 ++--
web/www/routino/visualiser.html.en | 2 +-
web/www/routino/visualiser.html.fr | 28 ++---
web/www/routino/visualiser.html.hu | 2 +-
web/www/routino/visualiser.html.nl | 2 +-
web/www/routino/visualiser.html.pl | 6 +-
web/www/routino/visualiser.html.ru | 88 +++++++-------
xml/routino-tagging.xml | 34 +++++-
xml/routino-translations.xml | 18 +--
882 files changed, 902 insertions(+), 473 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce8e83c..c3fb53f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,178 @@
+2017-01-12 Andrew M. Bishop <amb>
+
+ Version 3.2 released.
+
+2017-03-12 [r1903] Andrew M. Bishop <amb>
+
+ * FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
+ src/version.h: Update to version 3.2.
+
+2017-01-12 [r1902] Andrew M. Bishop <amb>
+
+ * web/translations/translation.de.txt: Added another translated
+ German phrase (via http://www.routino.org/translations/).
+
+2017-01-05 [r1901] Andrew M. Bishop <amb>
+
+ * web/translations/router.html: Change some HTML to improve web
+ page format when zoomed in or out.
+
+2017-01-04 [r1900] Andrew M. Bishop <amb>
+
+ * web/www/routino/router.css: Remove some CSS to improve web page
+ format when zoomed in or out.
+
+2016-12-20 [r1899] Andrew M. Bishop <amb>
+
+ * extras/statistics/dumper.c: Resize the array as crossings are
+ added rather than starting with a "large enough" array.
+
+2016-11-22 [r1898] Andrew M. Bishop <amb>
+
+ * xml/routino-tagging.xml: Handle more tags like access:foot=* by
+ translating them to foot=*.
+
+2016-09-20 [r1897] Andrew M. Bishop <amb>
+
+ * web/translations/translation.pl.txt: More Polish translations
+ (via http://www.routino.org/translations/).
+
+2016-09-18 [r1896] Andrew M. Bishop <amb>
+
+ * extras/find-fixme/web/www/fixme.cgi, web/www/routino/results.cgi,
+ web/www/routino/router.cgi, web/www/routino/router.pl,
+ web/www/routino/search.cgi, web/www/routino/search.pl,
+ web/www/routino/statistics.cgi,
+ web/www/routino/update-profiles.pl,
+ web/www/routino/visualiser.cgi: When using 'require' in Perl
+ scripts for a local file use './' prefix for filename because the
+ current directory is no longer on the include path in new
+ versions.
+
+2016-09-11 [r1895] Andrew M. Bishop <amb>
+
+ * web/translations/translation.pl.txt,
+ xml/routino-translations.xml: More Polish translations (via
+ http://www.routino.org/translations/).
+
+2016-09-08 [r1894] Andrew M. Bishop <amb>
+
+ * src/translations.c: Ensure that when a language doesn't have a
+ full set of translations the built-in ones generate valid HTML.
+
+2016-09-08 [r1893] Andrew M. Bishop <amb>
+
+ * web/www/routino/router.leaflet.js,
+ web/www/routino/router.openlayers.js: Ensure that when selecting
+ a new language web-page that this language is used as the default
+ for the generated route (previously it was selected on the
+ web-page but not used).
+
+2016-09-08 [r1892] Andrew M. Bishop <amb>
+
+ * web/translations/translation.pl.txt,
+ xml/routino-translations.xml: More Polish translations (via
+ http://www.routino.org/translations/).
+
+2016-08-20 [r1891] Andrew M. Bishop <amb>
+
+ * src/filedumperx.c: Bug fix for error detected by gcc-6.
+
+2016-08-12 [r1890] Andrew M. Bishop <amb>
+
+ * web/www/routino/mapprops.js: Remove MapQuest as a default tile
+ source since they are no longer available.
+
+2016-07-12 [r1889] Andrew M. Bishop <amb>
+
+ * src/planetsplitter.c, src/router+lib.c, src/router.c: Improve the
+ error message when the default profiles, translations or tagging
+ files cannot be found.
+
+2016-07-08 [r1888] Andrew M. Bishop <amb>
+
+ * doc/INSTALL.txt, doc/html/installation.html: Update instructions
+ to reflect that the Apache root directory might not be
+ '/var/www/'.
+
+2016-07-05 [r1887] Andrew M. Bishop <amb>
+
+ * web/translations/translation.de.txt: More German translations
+ (via http://www.routino.org/translations/).
+
+2016-07-04 [r1886] Andrew M. Bishop <amb>
+
+ * web/translations/translation.fr.txt,
+ xml/routino-translations.xml: More French translations (via
+ http://www.routino.org/translations/).
+
+2016-06-19 [r1885] Andrew M. Bishop <amb>
+
+ * src/optimiser.c: Bug fix - if the start and finish of a route
+ segment are the same point and the previous route segment
+ finished with a fake segment then it would crash.
+
+2016-06-06 [r1878-1879] Andrew M. Bishop <amb>
+
+ * src/test/expected/turns-WP01.txt,
+ src/test/expected/turns-WP02.txt,
+ src/test/expected/turns-WP03.txt,
+ src/test/expected/turns-WP04.txt,
+ src/test/expected/turns-WP05.txt,
+ src/test/expected/turns-WP06.txt,
+ src/test/expected/turns-WP07.txt,
+ src/test/expected/turns-WP08.txt,
+ src/test/expected/turns-WP09.txt,
+ src/test/expected/turns-WP10.txt,
+ src/test/expected/turns-WP11.txt,
+ src/test/expected/turns-WP12.txt,
+ src/test/expected/turns-WP13.txt,
+ src/test/expected/turns-WP14.txt,
+ src/test/expected/turns-WP15.txt: Update test cases after
+ ignoring highways forbidden by turn restrictions when determining
+ which interesting junctions.
+
+ * src/functions.h, src/output.c, src/router.c, src/routino.c:
+ Ignore highways that are forbidden by turn restrictions when
+ determining which ones are interesting for the HTML format
+ output.
+
+2016-04-07 [r1877] Andrew M. Bishop <amb>
+
+ * web/translations/router.html, web/www/routino/router.css,
+ web/www/routino/router.leaflet.js,
+ web/www/routino/router.openlayers.js: Move the two route buttons
+ to be just below the waypoints so they are less likely to scroll
+ off the screen. Add another pair of route buttons on the results
+ tab to make it quicker to re-calculate a route after moving the
+ waypoints.
+
+2016-03-30 [r1876] Andrew M. Bishop <amb>
+
+ * web/translations/translation.ru.txt: More Russian translations
+ (via http://www.routino.org/translations/).
+
+2016-03-29 [r1875] Andrew M. Bishop <amb>
+
+ * web/translations/translation.ru.txt: More Russian translations
+ (via http://www.routino.org/translations/).
+
+2016-03-26 [r1874] Andrew M. Bishop <amb>
+
+ * web/translations/translation.ru.txt,
+ xml/routino-translations.xml: More Russian translations (via
+ http://www.routino.org/translations/).
+
+2016-03-18 [r1873] Andrew M. Bishop <amb>
+
+ * web/www/leaflet/install.sh: Update to use the newer version of
+ Leaflet (0.7.7).
+
+2016-03-15 [r1872] Andrew M. Bishop <amb>
+
+ * src/version.h: Update the version number to note that it includes
+ changes since the latest release.
+
2016-03-06 Andrew M. Bishop <amb>
Version 3.1.1 released.
diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
index c65ff76..6edaf0f 100644
--- a/doc/INSTALL.txt
+++ b/doc/INSTALL.txt
@@ -32,8 +32,10 @@ Quick Start Guide
make
The files for the web interface can now be copied to the web server
- directory. On Debian this is '/var/www' and the files changed to be
- owned by the user Apache runs as.
+ directory. On Debian this is '/var/www' (or more recently '/var/www/html')
+ and the files changed to be owned by the user Apache runs as. The
+ instructions below are based on the assumption that the files are placed in
+ '/var/www', replace this with the chosen installation location if different.
cp -a web /var/www/routino
chown -R www-data:www-data /var/www/routino
@@ -307,4 +309,4 @@ Configuration of Web Server
--------
-Copyright 2008-2015 Andrew M. Bishop.
+Copyright 2008-2016 Andrew M. Bishop.
diff --git a/doc/NEWS.txt b/doc/NEWS.txt
index b4860a3..b1f163c 100644
--- a/doc/NEWS.txt
+++ b/doc/NEWS.txt
@@ -1,3 +1,37 @@
+Version 3.2 of Routino released : Sun Mar 12 2017
+-------------------------------------------------
+
+Bug fixes:
+ Don't crash if the start & finish of a route are the same point (some cases).
+ Update installation instructions in case Apache root is not '/var/www'.
+ Improve messages if default profiles, translations or tagging files not found.
+ Fix an error in filedumperx detected by gcc-6 indentation checker.
+ Ensure that selecting a language web-page defaults to that language output.
+ Ensure that a language that is missing some translations still get valid HTML.
+ Fix Perl scripts that include others (current directory not on include path).
+
+Web pages:
+ Update to use the latest version of Leaflet (0.7.7).
+ Move the route buttons to be above the waypoints so they stay on screen.
+ Remove MapQuest as an optional tile source (no longer available).
+ Adjust some CSS and HTML so that the layout is preserved when zooming.
+
+Translations:
+ Updated French, German, Polish & Russian translations.
+
+OSM tagging:
+ Handle more tags like access:foot=* by translating them to foot=*.
+
+router:
+ Ignore junctions forbidden by turn restrictions when describing route.
+
+Extras:
+ Don't crash in the statistics dumper if some ways are *very* long.
+
+
+Note: This version is compatible with databases from versions 2.7.1 - 3.1.1.
+
+
Version 3.1.1 of Routino released : Sun Mar 6 2016
--------------------------------------------------
diff --git a/doc/README.txt b/doc/README.txt
index c2e61d2..2dc578b 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -132,6 +132,7 @@ Status
Version 3.0 of Routino was released on 12th September 2015.
Version 3.1 of Routino was released on 5th March 2016.
Version 3.1.1 of Routino was released on 6th March 2016.
+ Version 3.2 of Routino was released on 12th March 2017.
The full version history is available in the NEWS.txt file.
@@ -153,7 +154,7 @@ License
Copyright
---------
- Routino is copyright Andrew M. Bishop 2008-2016.
+ Routino is copyright Andrew M. Bishop 2008-2017.
Homepage
@@ -188,4 +189,4 @@ Subversion
--------
-Copyright 2008-2016 Andrew M. Bishop.
+Copyright 2008-2017 Andrew M. Bishop.
diff --git a/doc/html/installation.html b/doc/html/installation.html
index 07ea95f..0b48d72 100644
--- a/doc/html/installation.html
+++ b/doc/html/installation.html
@@ -12,7 +12,7 @@
Part of the Routino routing software.
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -86,8 +86,10 @@ make
</pre>
The files for the web interface can now be copied to the web server directory.
-On Debian this is <tt>/var/www</tt> and the files changed to be owned by the
-user Apache runs as.
+On Debian this is <tt>/var/www</tt> (or more recently <tt>/var/www/html</tt>)
+and the files changed to be owned by the user Apache runs as. The instructions
+below are based on the assumption that the files are placed in <tt>/var/www</tt>,
+replace this with the chosen installation location if different.
<pre class="boxed">
cp -a web /var/www/routino
diff --git a/doc/html/readme.html b/doc/html/readme.html
index 1cea79f..53b4fbd 100644
--- a/doc/html/readme.html
+++ b/doc/html/readme.html
@@ -12,7 +12,7 @@
Part of the Routino routing software.
- This file Copyright 2008-2016 Andrew M. Bishop
+ This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -214,64 +214,42 @@ Version 3.0 of Routino was released on 12th September 2015.
Version 3.1 of Routino was released on 5th March 2016.
<br>
Version 3.1.1 of Routino was released on 6th March 2016.
+<br>
+Version 3.2 of Routino was released on 12th March 2017.
<p>
The full version history is available in the NEWS.txt file.
-<h3 id="H_1_5_1" title="Changes 3.1.1">Changes in Version 3.1.1</h3>
+<h3 id="H_1_5_1" title="Changes 3.2">Changes in Version 3.2</h3>
<dl>
<dt>Bug fixes:
- <dd>Updated the version number in the executables to "3.1.1".
-</dl>
-
-<p>
-<b>There are no other changes compared to version 3.1.</b>
-
-<h3 id="H_1_5_2" title="Changes 3.1">Changes in Version 3.1</h3>
-
-<dl>
- <dt>Bug fixes:
- <dd>Make the whole of the highlighted entry on the webpage clickable.
- <br>Fix Makefiles so that 'make -j 4' works.
- <br>Fix Makefiles so that 'make test' works from a clean directory.
- <br>Fix bug on webpage with 'oneway' or 'turns' in the URL arguments.
- <br>Print error message on webpage if geolocation function unavailable.
- <br>Fix bug where the optimum end of the route was not being found.
- <br>Reduce the preference for service roads in the default routing profile.
- <br>Remove literal type conversion error when validating profile values.
-
- <dt>Library:
- <dd>Add a version number to the shared library (SONAME).
- <br>Include the version number of Routino into the library as a string variable.
- <br>Add loop and reverse route as options to the library.
-
- <dt>planetsplitter:
- <dd>Use 64-bit numbers for the node ID when processing an OSM file.
-
- <dt>router:
- <dd>Change file output formats so that waypoint numbers are included.
- <br>When calculating a route with loop and reverse start route from waypoint 1.
- <br>Calculate the route from both ends towards the middle.
-
- <dt>Translations:
- <dd>Change the names of the GPX route waypoints in translations.xml.
- <br>Updated French and German translations.
-
- <dt>Documentation
- <dd>Updated the instructions for setting up on Apache (version 2.4.x).
-
+ <dd>Don't crash if the start & finish of a route are the same point (some cases).
+ <br>Update installation instructions in case Apache root is not '/var/www'.
+ <br>Improve messages if default profiles, translations or tagging files not found.
+ <br>Fix an error in filedumperx detected by gcc-6 indentation checker.
+ <br>Ensure that selecting a language web-page defaults to that language output.
+ <br>Ensure that a language that is missing some translations still get valid HTML.
+ <br>Fix Perl scripts that include others (current directory not on include path).
<dt>Web pages:
- <dd>Add a loop & reverse checkbox, replace loop & reverse buttons with icons.
-
+ <dd>Update to use the latest version of Leaflet (0.7.7).
+ <br>Move the route buttons to be above the waypoints so they stay on screen.
+ <br>Remove MapQuest as an optional tile source (no longer available).
+ <br>Adjust some CSS and HTML so that the layout is preserved when zooming.
+ <dt>Translations:
+ <dd>Updated French, German, Polish & Russian translations.
+ <dt>OSM tagging:
+ <dd>Handle more tags like access:foot=* by translating them to foot=*.
+ <dt>router:
+ <dd>Ignore junctions forbidden by turn restrictions when describing route.
<dt>Extras:
- <dd>Add scripts to process the database and create maps of highway statistics.
+ <dd>Don't crash in the statistics dumper if some ways are *very* long.
</dl>
<p>
-<b>Note:</b> This version is compatible with databases from version 2.7.1 - 3.0.
+<b>Note:</b> This version is compatible with databases from versions 2.7.1 - 3.1.1.
<h2 id="H_1_6">License</h2>
@@ -292,7 +270,7 @@ software.
<h3 id="H_1_6_1">Copyright</h3>
-Routino is copyright Andrew M. Bishop 2008-2016.
+Routino is copyright Andrew M. Bishop 2008-2017.
<h2 id="H_1_7">Homepage</h2>
diff --git a/extras/find-fixme/web/www/fixme.cgi b/extras/find-fixme/web/www/fixme.cgi
index 19422cd..b29537d 100755
--- a/extras/find-fixme/web/www/fixme.cgi
+++ b/extras/find-fixme/web/www/fixme.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2014 Andrew M. Bishop
+# This file Copyright 2008-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/extras/statistics/dumper.c b/extras/statistics/dumper.c
index 865d5d1..6182386 100644
--- a/extras/statistics/dumper.c
+++ b/extras/statistics/dumper.c
@@ -79,6 +79,7 @@ int main(int argc,char** argv)
index_t item;
crossing *crossings=(crossing*)malloc(128*sizeof(crossing));
crossing **crossingsp=(crossing**)malloc(128*sizeof(crossing*));
+ int crossing_alloc=128;
float ***highways,***transports,***properties,***speeds;
double lat,lon,x,y;
uint32_t xmin,ymin,xmax,ymax,xt,yt;
@@ -301,6 +302,13 @@ int main(int argc,char** argv)
crossings[crossing_count].x=x;
crossings[crossing_count].y=y;
crossing_count++;
+
+ if(crossing_count==crossing_alloc)
+ {
+ crossing_alloc+=128;
+ crossings =(crossing *)realloc(crossings ,crossing_alloc*sizeof(crossing));
+ crossingsp=(crossing**)realloc(crossingsp,crossing_alloc*sizeof(crossing*));
+ }
}
}
@@ -330,6 +338,13 @@ int main(int argc,char** argv)
crossings[crossing_count].x=x;
crossings[crossing_count].y=y;
crossing_count++;
+
+ if(crossing_count==crossing_alloc)
+ {
+ crossing_alloc+=128;
+ crossings =(crossing *)realloc(crossings ,crossing_alloc*sizeof(crossing));
+ crossingsp=(crossing**)realloc(crossingsp,crossing_alloc*sizeof(crossing*));
+ }
}
}
diff --git a/src/filedumperx.c b/src/filedumperx.c
index 6eb971d..a99d16d 100644
--- a/src/filedumperx.c
+++ b/src/filedumperx.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -247,10 +247,10 @@ static void print_route_relations(const char *filename)
while(!ReadFileBuffered(fd,&nodeid,sizeof(node_t)) && nodeid!=NO_NODE_ID)
printf(" node=%"Pnode_t"\n",nodeid);
- while(!ReadFileBuffered(fd,&wayid,sizeof(way_t)) && wayid!=NO_WAY_ID);
+ while(!ReadFileBuffered(fd,&wayid,sizeof(way_t)) && wayid!=NO_WAY_ID)
printf(" way=%"Pway_t"\n",wayid);
- while(!ReadFileBuffered(fd,&relationid,sizeof(relation_t)) && relationid!=NO_RELATION_ID);
+ while(!ReadFileBuffered(fd,&relationid,sizeof(relation_t)) && relationid!=NO_RELATION_ID)
printf(" relation=%"Prelation_t"\n",relationid);
}
diff --git a/src/functions.h b/src/functions.h
index 85e921e..3c8d8a0 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -41,7 +41,7 @@ Results *CalculateRoute(Nodes *nodes,Segments *segments,Ways *ways,Relations *re
/* Functions in output.c */
-Routino_Output *PrintRoute(Results **results,int nresults,Nodes *nodes,Segments *segments,Ways *ways,Profile *profile,Translation *translation);
+Routino_Output *PrintRoute(Results **results,int nresults,Nodes *nodes,Segments *segments,Ways *ways,Relations *relations,Profile *profile,Translation *translation);
#endif /* FUNCTIONS_H */
diff --git a/src/optimiser.c b/src/optimiser.c
index 3b5d253..94846fb 100644
--- a/src/optimiser.c
+++ b/src/optimiser.c
@@ -129,6 +129,9 @@ Results *CalculateRoute(Nodes *nodes,Segments *segments,Ways *ways,Relations *re
prev_segment=FindClosestSegment(nodes,segments,ways,lat,lon,1,profile,&distmin,&node1,&node2,&dist1,&dist2);
}
+ if(IsFakeSegment(prev_segment))
+ prev_segment=IndexRealSegment(prev_segment);
+
fake_segment=CreateFakeNullSegment(segments,start_node,prev_segment,finish_waypoint);
result1=InsertResult(complete,start_node,prev_segment);
diff --git a/src/output.c b/src/output.c
index 3b34bff..44c70fd 100644
--- a/src/output.c
+++ b/src/output.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -31,6 +31,7 @@
#include "nodes.h"
#include "segments.h"
#include "ways.h"
+#include "relations.h"
#include "functions.h"
#include "fakes.h"
@@ -97,12 +98,14 @@ static const char junction_other_way[Highway_Count][Highway_Count]=
Ways *ways The set of ways to use.
+ Relations *relations The set of relations to use.
+
Profile *profile The profile containing the transport type, speeds and allowed highways.
Translation *translation The set of translated strings.
++++++++++++++++++++++++++++++++++++++*/
-Routino_Output *PrintRoute(Results **results,int nresults,Nodes *nodes,Segments *segments,Ways *ways,Profile *profile,Translation *translation)
+Routino_Output *PrintRoute(Results **results,int nresults,Nodes *nodes,Segments *segments,Ways *ways,Relations *relations,Profile *profile,Translation *translation)
{
FILE *htmlfile=NULL,*gpxtrackfile=NULL,*gpxroutefile=NULL,*textfile=NULL,*textallfile=NULL;
Routino_Output *listhead=NULL,*htmllist=NULL, *textlist=NULL,*textalllist=NULL,*htmlalllist=NULL;
@@ -580,6 +583,14 @@ Routino_Output *PrintRoute(Results **results,int nresults,Nodes *nodes,Segments
}
}
+ if(profile->turns && IsSuperNode(resultnodep) && IsTurnRestrictedNode(resultnodep))
+ {
+ index_t turnrelation=FindFirstTurnRelation2(relations,result->node,realsegment);
+
+ if(turnrelation!=NO_RELATION && !IsTurnAllowed(relations,turnrelation,result->node,realsegment,seg,profile->allow))
+ cango=0;
+ }
+
if(cango)
{
Way *wayp=LookupWay(ways,segmentp->way,3);
diff --git a/src/planetsplitter.c b/src/planetsplitter.c
index f0e8ce1..c49529a 100644
--- a/src/planetsplitter.c
+++ b/src/planetsplitter.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -187,7 +187,7 @@ int main(int argc,char** argv)
{
if(!ExistsFile(tagging))
{
- fprintf(stderr,"Error: The '--tagging' option specifies a file that does not exist.\n");
+ fprintf(stderr,"Error: The '--tagging' option specifies a file '%s' that does not exist.\n",tagging);
exit(EXIT_FAILURE);
}
}
@@ -197,15 +197,16 @@ int main(int argc,char** argv)
if(!ExistsFile(tagging))
{
- free(tagging);
-
- tagging=FileName(ROUTINO_DATADIR,NULL,"tagging.xml");
+ char *defaulttagging=FileName(ROUTINO_DATADIR,NULL,"tagging.xml");
- if(!ExistsFile(tagging))
+ if(!ExistsFile(defaulttagging))
{
- fprintf(stderr,"Error: The '--tagging' option was not used and the default 'tagging.xml' does not exist.\n");
+ fprintf(stderr,"Error: The '--tagging' option was not used and the files '%s' and '%s' do not exist.\n",tagging,defaulttagging);
exit(EXIT_FAILURE);
}
+
+ free(tagging);
+ tagging=defaulttagging;
}
}
diff --git a/src/router+lib.c b/src/router+lib.c
index 48b8937..176702f 100644
--- a/src/router+lib.c
+++ b/src/router+lib.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -209,7 +209,7 @@ int main(int argc,char** argv)
{
if(access(profiles,F_OK))
{
- fprintf(stderr,"Error: The '--profiles' option specifies a file that does not exist.\n");
+ fprintf(stderr,"Error: The '--profiles' option specifies a file '%s' that does not exist.\n",profiles);
exit(EXIT_FAILURE);
}
}
@@ -219,15 +219,16 @@ int main(int argc,char** argv)
if(access(profiles,F_OK))
{
- free(profiles);
-
- profiles=FileName(ROUTINO_DATADIR,NULL,"profiles.xml");
+ char *defaultprofiles=FileName(ROUTINO_DATADIR,NULL,"profiles.xml");
- if(access(profiles,F_OK))
+ if(access(defaultprofiles,F_OK))
{
- fprintf(stderr,"Error: The '--profiles' option was not used and the default 'profiles.xml' does not exist.\n");
+ fprintf(stderr,"Error: The '--profiles' option was not used and the files '%s' and '%s' do not exist.\n",profiles,defaultprofiles);
exit(EXIT_FAILURE);
}
+
+ free(profiles);
+ profiles=defaultprofiles;
}
}
@@ -249,7 +250,7 @@ int main(int argc,char** argv)
{
char **list=Routino_GetProfileNames();
- fprintf(stderr,"Error: Cannot find a profile called '%s' in '%s'.\n",profilename,profiles);
+ fprintf(stderr,"Error: Cannot find a profile called '%s' in the file '%s'.\n",profilename,profiles);
fprintf(stderr,"Profiles available are: %s",*list++);
while(*list)
@@ -275,15 +276,16 @@ int main(int argc,char** argv)
if(access(translations,F_OK))
{
- free(translations);
-
- translations=FileName(ROUTINO_DATADIR,NULL,"translations.xml");
+ char *defaulttranslations=FileName(ROUTINO_DATADIR,NULL,"translations.xml");
- if(access(translations,F_OK))
+ if(access(defaulttranslations,F_OK))
{
- fprintf(stderr,"Error: The '--translations' option was not used and the default 'translations.xml' does not exist.\n");
+ fprintf(stderr,"Error: The '--translations' option was not used and the files '%s' and '%s' do not exist.\n",translations,defaulttranslations);
exit(EXIT_FAILURE);
}
+
+ free(translations);
+ translations=defaulttranslations;
}
}
@@ -302,7 +304,7 @@ int main(int argc,char** argv)
char **list1=Routino_GetTranslationLanguages();
char **list2=Routino_GetTranslationLanguageFullNames();
- fprintf(stderr,"Warning: Cannot find a translation called '%s' in '%s'.\n",language,translations);
+ fprintf(stderr,"Warning: Cannot find a translation called '%s' in the file '%s'.\n",language,translations);
fprintf(stderr,"Languages available are: %s (%s)",*list1++,*list2++);
while(*list1)
diff --git a/src/router.c b/src/router.c
index 2bc082c..23ee353 100644
--- a/src/router.c
+++ b/src/router.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -256,7 +256,7 @@ int main(int argc,char** argv)
{
if(!ExistsFile(profiles))
{
- fprintf(stderr,"Error: The '--profiles' option specifies a file that does not exist.\n");
+ fprintf(stderr,"Error: The '--profiles' option specifies a file '%s' that does not exist.\n",profiles);
exit(EXIT_FAILURE);
}
}
@@ -266,15 +266,16 @@ int main(int argc,char** argv)
if(!ExistsFile(profiles))
{
- free(profiles);
-
- profiles=FileName(ROUTINO_DATADIR,NULL,"profiles.xml");
+ char *defaultprofiles=FileName(ROUTINO_DATADIR,NULL,"profiles.xml");
- if(!ExistsFile(profiles))
+ if(!ExistsFile(defaultprofiles))
{
- fprintf(stderr,"Error: The '--profiles' option was not used and the default 'profiles.xml' does not exist.\n");
+ fprintf(stderr,"Error: The '--profiles' option was not used and the files '%s' and '%s' do not exist.\n",profiles,defaultprofiles);
exit(EXIT_FAILURE);
}
+
+ free(profiles);
+ profiles=defaultprofiles;
}
}
@@ -291,7 +292,7 @@ int main(int argc,char** argv)
if(!profile)
{
- fprintf(stderr,"Error: Cannot find a profile called '%s' in '%s'.\n",profilename,profiles);
+ fprintf(stderr,"Error: Cannot find a profile called '%s' in the file '%s'.\n",profilename,profiles);
profile=(Profile*)calloc(1,sizeof(Profile));
profile->transport=transport;
@@ -435,7 +436,7 @@ int main(int argc,char** argv)
{
if(!ExistsFile(translations))
{
- fprintf(stderr,"Error: The '--translations' option specifies a file that does not exist.\n");
+ fprintf(stderr,"Error: The '--translations' option specifies a file '%s' that does not exist.\n",translations);
exit(EXIT_FAILURE);
}
}
@@ -445,15 +446,16 @@ int main(int argc,char** argv)
if(!ExistsFile(translations))
{
- free(translations);
-
- translations=FileName(ROUTINO_DATADIR,NULL,"translations.xml");
+ char *defaulttranslations=FileName(ROUTINO_DATADIR,NULL,"translations.xml");
- if(!ExistsFile(translations))
+ if(!ExistsFile(defaulttranslations))
{
- fprintf(stderr,"Error: The '--translations' option was not used and the default 'translations.xml' does not exist.\n");
+ fprintf(stderr,"Error: The '--translations' option was not used and the files '%s' and '%s' do not exist.\n",translations,defaulttranslations);
exit(EXIT_FAILURE);
}
+
+ free(translations);
+ translations=defaulttranslations;
}
}
@@ -469,7 +471,7 @@ int main(int argc,char** argv)
if(!translation)
{
- fprintf(stderr,"Warning: Cannot find a translation called '%s' in '%s'.\n",language,translations);
+ fprintf(stderr,"Warning: Cannot find a translation called '%s' in the file '%s'.\n",language,translations);
exit(EXIT_FAILURE);
}
}
@@ -663,7 +665,7 @@ int main(int argc,char** argv)
printf_first("Generating Result Outputs");
if(!option_file_none)
- PrintRoute(results,nresults,OSMNodes,OSMSegments,OSMWays,profile,translation);
+ PrintRoute(results,nresults,OSMNodes,OSMSegments,OSMWays,OSMRelations,profile,translation);
if(!option_quiet)
printf_last("Generated Result Outputs");
diff --git a/src/routino.c b/src/routino.c
index 9f58d6e..b655609 100644
--- a/src/routino.c
+++ b/src/routino.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2015 Andrew M. Bishop
+ This file Copyright 2015-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -705,7 +705,7 @@ DLL_PUBLIC Routino_Output *Routino_CalculateRoute(Routino_Database *database,Rou
/* Print the route */
- output=PrintRoute(results,nwaypoints_routed-1,database->nodes,database->segments,database->ways,profile,translation);
+ output=PrintRoute(results,nwaypoints_routed-1,database->nodes,database->segments,database->ways,database->relations,profile,translation);
if(progress_func && !progress_func(1.0))
{
diff --git a/src/test/expected/turns-WP01.txt b/src/test/expected/turns-WP01.txt
index 6c0107f..fe0650d 100644
--- a/src/test/expected/turns-WP01.txt
+++ b/src/test/expected/turns-WP01.txt
@@ -7,7 +7,7 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
-0.220111 -0.519553 17 Inter 0.065 0.08 0.47 0.4 48 351 loop 1
-0.219817 -0.519807 15 Inter 0.043 0.05 0.51 0.5 48 319 loop 1
diff --git a/src/test/expected/turns-WP02.txt b/src/test/expected/turns-WP02.txt
index 231f57b..6f5373d 100644
--- a/src/test/expected/turns-WP02.txt
+++ b/src/test/expected/turns-WP02.txt
@@ -7,7 +7,7 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
-0.220111 -0.519553 17 Inter 0.065 0.08 0.47 0.4 48 351 loop 1
-0.219817 -0.519807 15 Inter 0.043 0.05 0.51 0.5 48 319 loop 1
diff --git a/src/test/expected/turns-WP03.txt b/src/test/expected/turns-WP03.txt
index 6b7f9ba..173b5a3 100644
--- a/src/test/expected/turns-WP03.txt
+++ b/src/test/expected/turns-WP03.txt
@@ -7,7 +7,7 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
-0.220111 -0.519553 17 Inter 0.065 0.08 0.47 0.4 48 351 loop 1
-0.219817 -0.519807 15 Waypt#2 0.043 0.05 0.51 0.5 48 319 loop 1
diff --git a/src/test/expected/turns-WP04.txt b/src/test/expected/turns-WP04.txt
index 6e756d9..3c4ea17 100644
--- a/src/test/expected/turns-WP04.txt
+++ b/src/test/expected/turns-WP04.txt
@@ -7,18 +7,18 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
- -0.220708 -0.518842 22* Junct 0.069 0.09 0.47 0.4 48 91 high street
+ -0.220708 -0.518842 22* Inter 0.069 0.09 0.47 0.4 48 91 high street
-0.220724 -0.518071 31* Junct 0.085 0.10 0.56 0.5 48 91 high street
-0.220143 -0.518162 30 Inter 0.065 0.08 0.62 0.6 48 351 loop 2
-0.219850 -0.518416 27 Inter 0.043 0.05 0.67 0.7 48 319 loop 2
-0.220100 -0.518718 24* Inter 0.043 0.05 0.71 0.7 48 230 loop 2
-0.220206 -0.518739 -2 Waypt#2 0.012 0.01 0.72 0.7 48 191 loop 2
- -0.220708 -0.518842 22* Junct 0.057 0.07 0.78 0.8 48 191 loop 2
+ -0.220708 -0.518842 22* Inter 0.057 0.07 0.78 0.8 48 191 loop 2
-0.220724 -0.518071 31* Junct 0.085 0.10 0.86 0.9 48 91 high street
- -0.220739 -0.517425 34* Junct 0.071 0.09 0.93 1.0 48 91 high street
- -0.220760 -0.516647 48* Junct 0.086 0.11 1.02 1.1 48 91 high street
+ -0.220739 -0.517425 34* Inter 0.071 0.09 0.93 1.0 48 91 high street
+ -0.220760 -0.516647 48* Inter 0.086 0.11 1.02 1.1 48 91 high street
-0.220784 -0.516035 54* Junct 0.068 0.09 1.09 1.2 48 92 high street
-0.221431 -0.516056 53* Junct 0.072 0.04 1.16 1.2 96 181 main 2
-0.221376 -0.518235 29* Junct 0.242 0.30 1.40 1.5 48 271 bottom road
diff --git a/src/test/expected/turns-WP05.txt b/src/test/expected/turns-WP05.txt
index ee69abf..7d05677 100644
--- a/src/test/expected/turns-WP05.txt
+++ b/src/test/expected/turns-WP05.txt
@@ -7,17 +7,17 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
- -0.220708 -0.518842 22* Junct 0.069 0.09 0.47 0.4 48 91 high street
+ -0.220708 -0.518842 22* Inter 0.069 0.09 0.47 0.4 48 91 high street
-0.220724 -0.518071 31* Junct 0.085 0.10 0.56 0.5 48 91 high street
-0.220143 -0.518162 30 Inter 0.065 0.08 0.62 0.6 48 351 loop 2
-0.219850 -0.518416 27 Inter 0.043 0.05 0.67 0.7 48 319 loop 2
-0.220100 -0.518718 24* Waypt#2 0.043 0.05 0.71 0.7 48 230 loop 2
- -0.220708 -0.518842 22* Junct 0.069 0.09 0.78 0.8 48 191 loop 2
+ -0.220708 -0.518842 22* Inter 0.069 0.09 0.78 0.8 48 191 loop 2
-0.220724 -0.518071 31* Junct 0.085 0.10 0.86 0.9 48 91 high street
- -0.220739 -0.517425 34* Junct 0.071 0.09 0.93 1.0 48 91 high street
- -0.220760 -0.516647 48* Junct 0.086 0.11 1.02 1.1 48 91 high street
+ -0.220739 -0.517425 34* Inter 0.071 0.09 0.93 1.0 48 91 high street
+ -0.220760 -0.516647 48* Inter 0.086 0.11 1.02 1.1 48 91 high street
-0.220784 -0.516035 54* Junct 0.068 0.09 1.09 1.2 48 92 high street
-0.221431 -0.516056 53* Junct 0.072 0.04 1.16 1.2 96 181 main 2
-0.221376 -0.518235 29* Junct 0.242 0.30 1.40 1.5 48 271 bottom road
diff --git a/src/test/expected/turns-WP06.txt b/src/test/expected/turns-WP06.txt
index 658c148..a1551d3 100644
--- a/src/test/expected/turns-WP06.txt
+++ b/src/test/expected/turns-WP06.txt
@@ -7,17 +7,17 @@
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct- 0.072 0.04 0.07 0.0 96 182 main 1
-0.220666 -0.520893 5* Junct 0.173 0.11 0.24 0.2 96 182 main 1
- -0.220671 -0.520223 11* Junct 0.074 0.09 0.32 0.2 48 90 high street
+ -0.220671 -0.520223 11* Inter 0.074 0.09 0.32 0.2 48 90 high street
-0.220691 -0.519461 19* Junct 0.084 0.10 0.40 0.3 48 91 high street
- -0.220708 -0.518842 22* Junct 0.069 0.09 0.47 0.4 48 91 high street
+ -0.220708 -0.518842 22* Inter 0.069 0.09 0.47 0.4 48 91 high street
-0.220724 -0.518071 31* Junct 0.085 0.10 0.56 0.5 48 91 high street
-0.220143 -0.518162 30 Inter 0.065 0.08 0.62 0.6 48 351 loop 2
-0.219850 -0.518416 27 Waypt#2 0.043 0.05 0.67 0.7 48 319 loop 2
-0.220100 -0.518718 24* Inter 0.043 0.05 0.71 0.7 48 230 loop 2
- -0.220708 -0.518842 22* Junct 0.069 0.09 0.78 0.8 48 191 loop 2
+ -0.220708 -0.518842 22* Inter 0.069 0.09 0.78 0.8 48 191 loop 2
-0.220724 -0.518071 31* Junct 0.085 0.10 0.86 0.9 48 91 high street
- -0.220739 -0.517425 34* Junct 0.071 0.09 0.93 1.0 48 91 high street
- -0.220760 -0.516647 48* Junct 0.086 0.11 1.02 1.1 48 91 high street
+ -0.220739 -0.517425 34* Inter 0.071 0.09 0.93 1.0 48 91 high street
+ -0.220760 -0.516647 48* Inter 0.086 0.11 1.02 1.1 48 91 high street
-0.220784 -0.516035 54* Junct 0.068 0.09 1.09 1.2 48 92 high street
-0.221431 -0.516056 53* Junct 0.072 0.04 1.16 1.2 96 181 main 2
-0.221376 -0.518235 29* Junct 0.242 0.30 1.40 1.5 48 271 bottom road
diff --git a/src/test/expected/turns-WP07.txt b/src/test/expected/turns-WP07.txt
index e7c407d..85e9244 100644
--- a/src/test/expected/turns-WP07.txt
+++ b/src/test/expected/turns-WP07.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP08.txt b/src/test/expected/turns-WP08.txt
index 329ae24..855cf3e 100644
--- a/src/test/expected/turns-WP08.txt
+++ b/src/test/expected/turns-WP08.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP09.txt b/src/test/expected/turns-WP09.txt
index cc9993d..545ec07 100644
--- a/src/test/expected/turns-WP09.txt
+++ b/src/test/expected/turns-WP09.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP10.txt b/src/test/expected/turns-WP10.txt
index 43d7f6d..80f5347 100644
--- a/src/test/expected/turns-WP10.txt
+++ b/src/test/expected/turns-WP10.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP11.txt b/src/test/expected/turns-WP11.txt
index 994073d..b30a42d 100644
--- a/src/test/expected/turns-WP11.txt
+++ b/src/test/expected/turns-WP11.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP12.txt b/src/test/expected/turns-WP12.txt
index c132256..c424fe2 100644
--- a/src/test/expected/turns-WP12.txt
+++ b/src/test/expected/turns-WP12.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
diff --git a/src/test/expected/turns-WP13.txt b/src/test/expected/turns-WP13.txt
index 9db94cb..01c61b9 100644
--- a/src/test/expected/turns-WP13.txt
+++ b/src/test/expected/turns-WP13.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
@@ -24,8 +24,8 @@
-0.218431 -0.518243 28 Inter 0.041 0.05 0.76 0.9 48 300 loop 5
-0.218600 -0.518557 25* Inter 0.039 0.05 0.80 0.9 48 241 loop 5
-0.218691 -0.518602 -2 Waypt#2 0.011 0.01 0.81 1.0 48 206 loop 5
- -0.219135 -0.518823 23* Junct 0.054 0.07 0.86 1.0 48 206 loop 5
- -0.219145 -0.517626 33* Junct 0.133 0.17 1.00 1.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.054 0.07 0.86 1.0 48 206 loop 5
+ -0.219145 -0.517626 33* Inter 0.133 0.17 1.00 1.2 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 1.04 1.2 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 1.05 1.3 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 1.07 1.3 48 114 roundabout
diff --git a/src/test/expected/turns-WP14.txt b/src/test/expected/turns-WP14.txt
index 6576cc5..7d7395c 100644
--- a/src/test/expected/turns-WP14.txt
+++ b/src/test/expected/turns-WP14.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
@@ -23,8 +23,8 @@
-0.218619 -0.517921 32* Inter 0.067 0.08 0.72 0.8 48 330 loop 5
-0.218431 -0.518243 28 Inter 0.041 0.05 0.76 0.9 48 300 loop 5
-0.218600 -0.518557 25* Waypt#2 0.039 0.05 0.80 0.9 48 241 loop 5
- -0.219135 -0.518823 23* Junct 0.066 0.08 0.86 1.0 48 206 loop 5
- -0.219145 -0.517626 33* Junct 0.133 0.17 1.00 1.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.066 0.08 0.86 1.0 48 206 loop 5
+ -0.219145 -0.517626 33* Inter 0.133 0.17 1.00 1.2 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 1.04 1.2 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 1.06 1.3 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 1.07 1.3 48 114 roundabout
diff --git a/src/test/expected/turns-WP15.txt b/src/test/expected/turns-WP15.txt
index 3e9eedd..873326c 100644
--- a/src/test/expected/turns-WP15.txt
+++ b/src/test/expected/turns-WP15.txt
@@ -6,10 +6,10 @@
# Dist Durat'n Dist Durat'n
-0.218453 -0.520799 -1 Waypt#1 0.000 0.00 0.00 0.0
-0.219107 -0.520828 6* Junct 0.072 0.04 0.07 0.0 96 182 main 1
- -0.219123 -0.520207 12* Junct 0.069 0.09 0.14 0.1 48 91 top road
- -0.219131 -0.519426 20* Junct 0.086 0.11 0.23 0.2 48 90 top road
- -0.219135 -0.518823 23* Junct 0.067 0.08 0.29 0.3 48 90 top road
- -0.219145 -0.517626 33* Junct 0.133 0.17 0.43 0.5 48 90 top road
+ -0.219123 -0.520207 12* Inter 0.069 0.09 0.14 0.1 48 91 top road
+ -0.219131 -0.519426 20* Inter 0.086 0.11 0.23 0.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.067 0.08 0.29 0.3 48 90 top road
+ -0.219145 -0.517626 33* Inter 0.133 0.17 0.43 0.5 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 0.47 0.5 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 0.48 0.6 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 0.50 0.6 48 114 roundabout
@@ -23,8 +23,8 @@
-0.218619 -0.517921 32* Inter 0.067 0.08 0.72 0.8 48 330 loop 5
-0.218431 -0.518243 28 Waypt#2 0.041 0.05 0.76 0.9 48 300 loop 5
-0.218600 -0.518557 25* Inter 0.039 0.05 0.80 0.9 48 241 loop 5
- -0.219135 -0.518823 23* Junct 0.066 0.08 0.86 1.0 48 206 loop 5
- -0.219145 -0.517626 33* Junct 0.133 0.17 1.00 1.2 48 90 top road
+ -0.219135 -0.518823 23* Inter 0.066 0.08 0.86 1.0 48 206 loop 5
+ -0.219145 -0.517626 33* Inter 0.133 0.17 1.00 1.2 48 90 top road
-0.219144 -0.517257 36* Junct 0.041 0.05 1.04 1.2 48 89 top road
-0.219291 -0.517193 38 Inter 0.017 0.02 1.06 1.3 48 156 roundabout
-0.219352 -0.517060 42 Junct- 0.016 0.02 1.07 1.3 48 114 roundabout
diff --git a/src/translations.c b/src/translations.c
index 0d8ccab..7f1887f 100644
--- a/src/translations.c
+++ b/src/translations.c
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2010-2015 Andrew M. Bishop
+ This file Copyright 2010-2016 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -62,12 +62,12 @@ static Translation default_translation=
.html_roundabout = "Roundabout",
.html_title = "%s Route",
- .html_start = "<tr class='n'>Start at %s, head <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
- .html_node = "<tr class='n'>At %s, go <span class='t'>%s</span> heading <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
- .html_rbnode = "<tr class='n'>Leave %s, take the <span class='b'>%s</span> exit heading <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
- .html_segment = "<tr class='s'>Follow <span class='h'>%s</span> for <span class='d'>%.3f km, %.1f min</span>", /* span tags added when reading XML translations file */
- .html_stop = "<tr class='n'>Stop at %s\n",
- .html_total = "<tr class='t'><span class='j'>Total %.1f km, %.0f minutes</span>\n",/* span tags added when reading XML translations file */
+ .html_start = "<tr class='n'><td>Start at %s, head <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
+ .html_node = "<tr class='n'><td>At %s, go <span class='t'>%s</span> heading <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
+ .html_rbnode = "<tr class='n'><td>Leave %s, take the <span class='b'>%s</span> exit heading <span class='b'>%s</span>\n", /* span tags added when reading XML translations file */
+ .html_segment = "<tr class='s'><td>Follow <span class='h'>%s</span> for <span class='d'>%.3f km, %.1f min</span>", /* span tags added when reading XML translations file */
+ .html_stop = "<tr class='n'><td>Stop at %s\n",
+ .html_total = "<tr class='t'><td><span class='j'>Total %.1f km, %.0f minutes</span>\n",/* span tags added when reading XML translations file */
.html_subtotal= "<span class='j'>%.1f km, %.0f minutes</span>\n",/* span tag added when reading XML translations file */
.nothtml_waypoint = "Waypoint",
diff --git a/src/version.h b/src/version.h
index fd0a1b0..0acbd1f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -3,7 +3,7 @@
Part of the Routino routing software.
******************/ /******************
- This file Copyright 2016 Andrew M. Bishop
+ This file Copyright 2016, 2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
#ifndef VERSION_H
#define VERSION_H /*+ To stop multiple inclusions. +*/
-#define ROUTINO_VERSION "3.1.1"
+#define ROUTINO_VERSION "3.2"
#define ROUTINO_URL "<http://www.routino.org/>"
diff --git a/web/translations/router.html b/web/translations/router.html
index ea1998f..dd59969 100644
--- a/web/translations/router.html
+++ b/web/translations/router.html
@@ -13,7 +13,7 @@
Part of the Routino routing software.
- This file Copyright 2008-2015 Andrew M. Bishop
+ This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -99,7 +99,7 @@
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="@@WAYPOINT-POSITION@@" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
- <input name="lonXXX" type="text" size="7" title="@@WAYPOINT-LONGITUDE@@" onchange="formSetCoords(XXX);">E
+ <input name="lonXXX" type="text" size="6" title="@@WAYPOINT-LONGITUDE@@" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="@@WAYPOINT-LATITUDE@@" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -136,6 +136,12 @@
</div>
<div class="hideshow_box">
+ <span class="hideshow_title">@@FIND-BOX@@</span>
+ <input type="button" title="@@FIND-SHORTEST-ROUTE@@" id="shortest1" value="@@SHORTEST-ROUTE@@" onclick="findRoute('shortest');" disabled="disabled">
+ <input type="button" title="@@FIND-QUICKEST-ROUTE@@" id="quickest1" value="@@QUICKEST-ROUTE@@" onclick="findRoute('quickest');" disabled="disabled">
+ </div>
+
+ <div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">@@TRANSPORT-TYPE-BOX@@</span>
@@ -236,12 +242,6 @@
</div>
<div class="hideshow_box">
- <span class="hideshow_title">@@FIND-BOX@@</span>
- <input type="button" title="@@FIND-SHORTEST-ROUTE@@" id="shortest" value="@@SHORTEST-ROUTE@@" onclick="findRoute('shortest');" disabled="disabled">
- <input type="button" title="@@FIND-QUICKEST-ROUTE@@" id="quickest" value="@@QUICKEST-ROUTE@@" onclick="findRoute('quickest');" disabled="disabled">
- </div>
-
- <div class="hideshow_box">
<span class="hideshow_title">@@LINKS-BOX@@</span>
<a id="permalink_url" href="router.html">@@MAP-VIEW-LINK@@</a>
<br>
@@ -290,6 +290,12 @@
</div>
<div class="hideshow_box">
+ <span class="hideshow_title">@@FIND-BOX@@</span>
+ <input type="button" title="@@FIND-SHORTEST-ROUTE@@" id="shortest2" value="@@SHORTEST-ROUTE@@" onclick="findRoute('shortest');" disabled="disabled">
+ <input type="button" title="@@FIND-QUICKEST-ROUTE@@" id="quickest2" value="@@QUICKEST-ROUTE@@" onclick="findRoute('quickest');" disabled="disabled">
+ </div>
+
+ <div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">@@SHORTEST-ROUTE@@</span>
diff --git a/web/translations/translation.de.txt b/web/translations/translation.de.txt
index 9cf7721..683fb0a 100644
--- a/web/translations/translation.de.txt
+++ b/web/translations/translation.de.txt
@@ -237,9 +237,21 @@
@@SUPER-BUTTON@@ Super-Segments anzeigen
+@@WAYTYPE-BUTTON@@ Wegart des Abschnittes anzeigen
+$$WAYTYPE-INFO$$
+Spezial-Arten der Abschnitte (Einbahnstraße, beidseitige Fahrradwege und Kreisverkehre) werden angezeigt.
+Ein koloriertes Dreieck zeigt die erlaubte Fahrtrichtung an. Die Farben der Dreiecke hängen von der jeweiligen Art des Abschnittes ab.
+$$WAYTYPE-INFO$$
+
@@WAYTYPE-ONEWAY@@ Einbahnstraßen Segmente
+@@WAYTYPE-CYCLE-BOTH-WAYS@@ Fahrradweg auf beiden Seiten des Abschnittes
@@WAYTYPE-ROUNDABOUT@@ Kreisverkehr Segmente
+@@HIGHWAY-BUTTON@@ Wegabschnitte anzeigen
+$$HIGHWAY-INFO$$
+Jeder Abschnitt der ausgewählten Wegart ist gezeichnet.
+$$HIGHWAY-INFO$$
+
@@TURNS-BUTTON@@ Zeige Abbiegebeschränkungen
$$TURNS-INFO$$
Jede Abbiegebeschränkung wird mit einer Linie angezeigt
@@ -267,6 +279,8 @@ $$TURNS-INFO$$
@@LENGTH-LIMIT-9@@ 9.0 m Längenbeschränkung
+@@PROPERTY-BUTTON@@ Anzeigen der Wegeigenschaften
+
@@ERROR-LOG-BUTTON@@ Anzeige Fehlerprotokoll
@@CLEAR-DATA-BUTTON@@ Daten zurücksetzen
@@ -367,6 +381,10 @@ $$ROUTER-VISUALISER-INFO$$
# Multi-line descriptive translations (visualiser)
#
+$$VISUALISER-INSTRUCTIONS$$
+Zoomen Sie in die Karte und nutzen Sie den Knöpfe unten um die Daten herunter zu laden. Der Server liefert nur ein Ergebnis, wenn das ausgewählte Feld klein genug ist.
+$$VISUALISER-INSTRUCTIONS$$
+
$$VISUALISER-ROUTER-INFO$$
Um die Routenplanung auf der Karte durchzuführen, verwenden sie den untenstehenden Link.
$$VISUALISER-ROUTER-INFO$$
diff --git a/web/translations/translation.fr.txt b/web/translations/translation.fr.txt
index 150f17f..b8c1179 100644
--- a/web/translations/translation.fr.txt
+++ b/web/translations/translation.fr.txt
@@ -65,12 +65,13 @@
%%output-html_title%% Itinéraire %s
%%output-html_start%% Débute à %s, direction %s
%%output-html_node%% à %s, aller %s direction %s
-%%output-html_rbnode%% Quitter %s, prendre le %s sortir direction %s
+%%output-html_rbnode%% Quitter %s, prendre la sortie %s direction %s
%%output-html_segment%% Suivre %s pendant %.3f km, %.1f min
%%output-html_stop%% S'arrêter à %s
%%output-html_total%% Total %.1f km, %.0f minutes
%%output-html_subtotal%% %.1f km, %.0f minutes
+%%output-gpx_waypoint_waypt%% ETAPE
%%output-gpx_waypoint_trip%% POINT
%%output-gpx_desc%% Itinéraire %s entre les étapes 'début' et 'fin'
@@ -208,6 +209,23 @@
# Visualiser specific translations
#
+@@VISUALISER-TITLE@@ Afficheur d'itinéraire
+
+@@INSTRUCTIONS-BOX@@ Instructions
+@@ROUTER-BOX@@ Planificateur de Routino
+
+@@NO-DATA-DISPLAYED@@ Aucune donnée affichée
+
+@@VISUALISER-FAILED@@ Échec de récupération des données d'affichage!
+@@VISUALISER-NUM-JUNCTIONS@@ # intersections traitées
+@@VISUALISER-NUM-SUPER@@ # segments/super-nœuds traités
+@@VISUALISER-NUM-WAYTYPE@@ # segments de type "way" traités
+@@VISUALISER-NUM-SEGMENTS@@ # segments traités
+@@VISUALISER-NUM-NODES@@ # nœuds traités
+@@VISUALISER-NUM-ERRORS@@ # erreurs de log traitées
+
+@@JUNCTIONS-BUTTON@@ Afficher les intersections
+
@@HEIGHT-LIMIT-4@@ Hauteur limitée à 4,0 m
@@WIDTH-BUTTON@@ Afficher les limites de largeur
diff --git a/web/translations/translation.pl.txt b/web/translations/translation.pl.txt
index edf77a9..18f39d1 100644
--- a/web/translations/translation.pl.txt
+++ b/web/translations/translation.pl.txt
@@ -60,6 +60,7 @@
%%route_quickest%% Najszybsza
%%output-html_waypoint_waypoint%% Punkt
+%%output-html_waypoint_junction%% Połączenie
%%output-html_waypoint_roundabout%% Rondo
%%output-html_title%% %s Trasa
%%output-html_start%% Start %s kieruj się na %s
@@ -68,6 +69,9 @@
%%output-html_total%% Całkowity %.1f km, %.0f min.
%%output-html_subtotal%% %.1f km, %.0f min.
+%%output-gpx_waypoint_waypt%% Punkt
+%%output-gpx_waypoint_trip%% Podróż
+
%%output-gpx_desc%% %s trasa pomiędzy 'start' a 'koniec'
%%output-gpx_name%% %s trasa
%%output-gpx_step%% %s na %s przez %.3f km, %.1f min.
@@ -100,6 +104,7 @@
@@TRANSPORT-TYPE-BOX@@ Typ transportu
@@HIGHWAY-PREFERENCES-BOX@@ Preferowanie autostrad
@@SPEED-LIMITS-BOX@@ Ograniczenia prędkości
+@@PROPERTY-PREFERENCES-BOX@@ Ustawienia zmiennych
@@OTHER-RESTRICTIONS-BOX@@ Inne ograniczenia
@@FIND-BOX@@ Znajdź
@@LINKS-BOX@@ Połączenia
@@ -115,7 +120,11 @@
@@WAYPOINT-SEARCH@@ Znajdź miejsce
@@WAYPOINT-GET@@ Pobierz aktualna lokalizację
@@WAYPOINT-CENTRE1@@ Wycentruj mapę na tym punkcie
+@@WAYPOINT-UP@@ Przenieś ten punkt wyżej
+@@WAYPOINT-ADD@@ Dodaj punkt po tym
+@@WAYPOINT-COORDS@@ Współrzędne dla lokalizacji
@@WAYPOINT-HOME@@ Współrzędne lokalizacji
+@@WAYPOINT-CENTRE2@@ Wyśrodkuj ten punkt na mapie
@@TRANSPORT-FOOT@@ Pieszo
@@TRANSPORT-HORSE@@ Konno
@@ -124,6 +133,7 @@
@@TRANSPORT-MOPED@@ Moped
@@TRANSPORT-MOTORCYCLE@@ Motocykl
@@TRANSPORT-MOTORCAR@@ Samochód
+@@TRANSPORT-HGV@@ Pojazd ciężarowy
@@TRANSPORT-PSV@@ Pojazd użyteczności publicznej
@@HIGHWAY-MOTORWAY@@ Autostrada
diff --git a/web/translations/translation.ru.txt b/web/translations/translation.ru.txt
index 98bbb68..ac3e115 100644
--- a/web/translations/translation.ru.txt
+++ b/web/translations/translation.ru.txt
@@ -56,11 +56,12 @@
%%highway_steps%% лестница
%%highway_ferry%% паром
-%%route_shortest%% Короткий
+%%route_shortest%% Кратчайший
%%route_quickest%% Быстрый
-%%output-html_waypoint_waypoint%% путевая точка
+%%output-html_waypoint_waypoint%% Точка
%%output-html_waypoint_junction%% перекрестке
+%%output-html_waypoint_roundabout%% круговое движение
%%output-html_title%% %s маршрут
%%output-html_start%% Старт %s, на %s
%%output-html_node%% на %s, %s, на %s
@@ -69,6 +70,8 @@
%%output-html_total%% Всего %.1f км, %.0f минут
%%output-html_subtotal%% %.1f км, %.0f минут
+%%output-gpx_waypoint_waypt%% ТОЧКА
+
%%output-gpx_desc%% %s маршрут от 'Старта' до 'Финиша'
%%output-gpx_name%% %s маршрут
%%output-gpx_step%% на %s по '%s' %.3f км, %.1f мин
@@ -79,37 +82,85 @@
#
@@LANGUAGE@@ Русский
-@@LANGUAGE-WEBPAGE@@ Русский
+@@LANGUAGE-WEBPAGE@@ Страница на Русском языке
+@@OPTION-TAB@@ Настройки
@@OPTION-TAB-HELP@@ Задать настройки маршрутизации
+@@RESULTS-TAB@@ Результаты
+@@RESULTS-TAB-HELP@@ Смотрите результат прокладки маршрута
+
+@@DATA-TAB@@ Данные
+
+@@ROUTINO-WEBSITE@@ Сайт Routino
@@DOCUMENTATION@@ Документация
@@LANGUAGE-BOX@@ Язык
+@@WAYPOINTS-BOX@@ Точки
@@TRANSPORT-TYPE-BOX@@ Тип транспорта
+@@HIGHWAY-PREFERENCES-BOX@@ Настройки типа дорог
@@SPEED-LIMITS-BOX@@ Ограничения скорости
+@@PROPERTY-PREFERENCES-BOX@@ Настройки качества дорог
@@OTHER-RESTRICTIONS-BOX@@ Другие ограничения
+@@FIND-BOX@@ Найти
+@@LINKS-BOX@@ Ссылки
@@HELP-BOX@@ Помощь
@@STATUS-BOX@@ Статус
@@SHORTEST-ROUTE@@ Кратчайший маршрут
@@QUICKEST-ROUTE@@ Быстрейший маршрут
+@@STATISTICS-BOX@@ Routino Статистика
+
+@@WAYPOINT-SEARCH@@ Поиск по адресу
+@@WAYPOINT-GET@@ Текущее местоположение
+@@WAYPOINT-CENTRE1@@ Центрировать карту на этой точке
+@@WAYPOINT-UP@@ Поместить точку выше
+@@WAYPOINT-ADD@@ Добавить следующую точку
+@@WAYPOINT-COORDS@@ По координатам
+@@WAYPOINT-HOME@@ Переключение домашней локации
+@@WAYPOINT-CENTRE2@@ Переместить точку в центр карты
+@@WAYPOINT-DOWN@@ Поместить точку ниже
+@@WAYPOINT-REMOVE@@ Удалить эту путевую точку
+@@WAYPOINT-REVERSE@@ Перестроить в обратном порядке
+@@WAYPOINT-REVERSE-BUTTON@@ Обратный порядок
+@@WAYPOINT-LOOP@@ Добавить точку для зацикливания
+@@WAYPOINT-LOOP-BUTTON@@ Зациклить
+
+@@TRANSPORT-FOOT@@ Пешком
@@TRANSPORT-HORSE@@ Лошадь
@@TRANSPORT-WHEELCHAIR@@ Инвалидное кресло
@@TRANSPORT-BICYCLE@@ Велосипед
@@TRANSPORT-MOPED@@ Мопед
@@TRANSPORT-MOTORCYCLE@@ Мотоцикл
-@@TRANSPORT-GOODS@@ Товары
+@@TRANSPORT-MOTORCAR@@ Машина
+@@TRANSPORT-GOODS@@ Фургон
+@@TRANSPORT-HGV@@ Грузовой автомобиль
+@@TRANSPORT-PSV@@ Автобус
@@HIGHWAY-MOTORWAY@@ Автомагистраль
-
+@@HIGHWAY-TRUNK@@ Международная трасса
+@@HIGHWAY-PRIMARY@@ Дорога регионального значения
+@@HIGHWAY-SECONDARY@@ Дорога областного значения
+@@HIGHWAY-TERTIARY@@ Дорога районного значения
+@@HIGHWAY-UNCLASSIFIED@@ Дорога местного значения
+@@HIGHWAY-RESIDENTIAL@@ Улица
+@@HIGHWAY-SERVICE@@ Проезд
+@@HIGHWAY-TRACK@@ Дорога с/х назначения
+@@HIGHWAY-CYCLEWAY@@ Велодорожка
+@@HIGHWAY-PATH@@ Тропинка
+@@HIGHWAY-STEPS@@ Лестница
+@@HIGHWAY-FERRY@@ Паром
+
+@@PROPERTY-PAVED@@ Мощеная
+@@PROPERTY-MULTILANE@@ Многополосная
@@PROPERTY-BRIDGE@@ Мост
@@PROPERTY-TUNNEL@@ Туннель
@@PROPERTY-WALKINGROUTE@@ Пеший маршрут
@@PROPERTY-BICYCLEROUTE@@ Велодорожка
@@RESTRICT-ONEWAY@@ Односторонняя улица
+@@RESTRICT-TURNS@@ Ограничения поворота
@@RESTRICT-WEIGHT@@ Вес
@@RESTRICT-HEIGHT@@ Высота
@@RESTRICT-WIDTH@@ Ширина
@@ -118,6 +169,27 @@
@@FIND-SHORTEST-ROUTE@@ Найти кратчайший маршрут
@@FIND-QUICKEST-ROUTE@@ Найти быстрейший маршут
+@@EDIT-OSM-DATA@@ Редактировать данные OSM
+
+@@ROUTER-NOT-RUN@@ Роутер не запущен
+@@ROUTER-RUNNING@@ Прокладка маршрута...
+@@ROUTER-COMPLETED@@ Прокладка маршрута завершена
+@@ROUTER-ERROR@@ Ошибка прокладки маршрута
+@@ROUTER-FAILED@@ Ошибка при запуске
+@@VIEW-DETAILS@@ Подробнее
+
+@@NO-INFORMATION@@ Пусто
+@@HTML-ROUTE@@ HTML навигатор
+@@GPX-TRACK-ROUTE@@ Трек в формате GPX
+@@GPX-ROUTE@@ Маршрут в формате GPX
+@@FULL-TEXT-ROUTE@@ Подробный текстовый файл
+@@TEXT-ROUTE@@ Текстовый файл
+@@OPEN-POPUP@@ Открыть
+
+@@DISPLAY-STATISTICS@@ Показать статистику данных
+
+@@JAVASCRIPT-REQUIRED@@ Javascript <em>обязателен</em> для просмотра данной страницы, так как на ней используется интерактивная карта.
+@@GEO-DATA@@ Гео данные
@@TILES@@ Тайлы
#
@@ -131,11 +203,14 @@
@@VISUALISER-NUM-NODES@@ Обработано # нод
@@VISUALISER-NUM-TURNS@@ Обработано # ограничений поворотов
+@@WAYTYPE-ONEWAY@@ сегмент односторонней дороги
+
@@TURNS-BUTTON@@ Показывать ограничения поворотов
@@SPEED-BUTTON@@ Показывать ограничения скорости
@@LIMIT-CHANGE@@ Изменить ограничения
+@@LIMIT-NONE@@ Нет отграничений
@@SPEED-LIMIT-80@@ Ограничение скорости 80 км/ч
@@WEIGHT-BUTTON@@ Показывать ограничения по весу
@@ -148,6 +223,16 @@
@@WIDTH-BUTTON@@ Показывать ограничение ширины
+@@WIDTH-LIMIT-3@@ Ограничение ширины 3.0 метра
+
+@@LENGTH-BUTTON@@ Показать ограничения длинны
+
+@@LENGTH-LIMIT-9@@ Ограничение длинны 9.0 метров
+
+@@ERROR-LOG-BUTTON@@ Показать лог ошибок
+
+@@CLEAR-DATA-BUTTON@@ Очистить данные
+
#
# Multi-line descriptive translations (router)
#
@@ -156,3 +241,6 @@
# Multi-line descriptive translations (visualiser)
#
+$$VISUALISER-ROUTER-INFO$$
+Для прокладки маршрута на карте используйте ссылку ниже.
+$$VISUALISER-ROUTER-INFO$$
diff --git a/web/www/leaflet/install.sh b/web/www/leaflet/install.sh
index 1361ad0..8a81bb6 100755
--- a/web/www/leaflet/install.sh
+++ b/web/www/leaflet/install.sh
@@ -1,11 +1,11 @@
#!/bin/sh -x
-version=0.7.3
+version=0.7.7
# Download the file.
-wget http://leaflet-cdn.s3.amazonaws.com/build/leaflet-$version.zip
+wget http://cdn.leafletjs.com/leaflet/v$version/leaflet.zip
# Uncompress it.
-unzip leaflet-$version.zip
+unzip leaflet.zip
diff --git a/web/www/routino/icons/ball-0.png b/web/www/routino/icons/ball-0.png
index d54adaa..48a09c0 100644
Binary files a/web/www/routino/icons/ball-0.png and b/web/www/routino/icons/ball-0.png differ
diff --git a/web/www/routino/icons/ball-1.png b/web/www/routino/icons/ball-1.png
index fba4e31..fb1921a 100644
Binary files a/web/www/routino/icons/ball-1.png and b/web/www/routino/icons/ball-1.png differ
diff --git a/web/www/routino/icons/ball-2.png b/web/www/routino/icons/ball-2.png
index e664ba6..079b614 100644
Binary files a/web/www/routino/icons/ball-2.png and b/web/www/routino/icons/ball-2.png differ
diff --git a/web/www/routino/icons/ball-3.png b/web/www/routino/icons/ball-3.png
index 0b8c2bf..c495b25 100644
Binary files a/web/www/routino/icons/ball-3.png and b/web/www/routino/icons/ball-3.png differ
diff --git a/web/www/routino/icons/ball-4.png b/web/www/routino/icons/ball-4.png
index e0b46c9..74ab6a2 100644
Binary files a/web/www/routino/icons/ball-4.png and b/web/www/routino/icons/ball-4.png differ
diff --git a/web/www/routino/icons/ball-5.png b/web/www/routino/icons/ball-5.png
index 6c2aed0..8c212ae 100644
Binary files a/web/www/routino/icons/ball-5.png and b/web/www/routino/icons/ball-5.png differ
diff --git a/web/www/routino/icons/ball-6.png b/web/www/routino/icons/ball-6.png
index 01c37fe..082a619 100644
Binary files a/web/www/routino/icons/ball-6.png and b/web/www/routino/icons/ball-6.png differ
diff --git a/web/www/routino/icons/ball-7.png b/web/www/routino/icons/ball-7.png
index 770ca73..625b48c 100644
Binary files a/web/www/routino/icons/ball-7.png and b/web/www/routino/icons/ball-7.png differ
diff --git a/web/www/routino/icons/ball-8.png b/web/www/routino/icons/ball-8.png
index 770ca73..625b48c 100644
Binary files a/web/www/routino/icons/ball-8.png and b/web/www/routino/icons/ball-8.png differ
diff --git a/web/www/routino/icons/ball-9.png b/web/www/routino/icons/ball-9.png
index 770ca73..625b48c 100644
Binary files a/web/www/routino/icons/ball-9.png and b/web/www/routino/icons/ball-9.png differ
diff --git a/web/www/routino/icons/limit-0.0.png b/web/www/routino/icons/limit-0.0.png
index af89057..27ef86d 100644
Binary files a/web/www/routino/icons/limit-0.0.png and b/web/www/routino/icons/limit-0.0.png differ
diff --git a/web/www/routino/icons/limit-0.1.png b/web/www/routino/icons/limit-0.1.png
index 6d9d1da..59b5078 100644
Binary files a/web/www/routino/icons/limit-0.1.png and b/web/www/routino/icons/limit-0.1.png differ
diff --git a/web/www/routino/icons/limit-0.2.png b/web/www/routino/icons/limit-0.2.png
index 2aa3aa6..56cdd46 100644
Binary files a/web/www/routino/icons/limit-0.2.png and b/web/www/routino/icons/limit-0.2.png differ
diff --git a/web/www/routino/icons/limit-0.3.png b/web/www/routino/icons/limit-0.3.png
index f5c3f4c..8995db6 100644
Binary files a/web/www/routino/icons/limit-0.3.png and b/web/www/routino/icons/limit-0.3.png differ
diff --git a/web/www/routino/icons/limit-0.4.png b/web/www/routino/icons/limit-0.4.png
index e2be713..83ae1b3 100644
Binary files a/web/www/routino/icons/limit-0.4.png and b/web/www/routino/icons/limit-0.4.png differ
diff --git a/web/www/routino/icons/limit-0.5.png b/web/www/routino/icons/limit-0.5.png
index 4e27ecb..78de162 100644
Binary files a/web/www/routino/icons/limit-0.5.png and b/web/www/routino/icons/limit-0.5.png differ
diff --git a/web/www/routino/icons/limit-0.6.png b/web/www/routino/icons/limit-0.6.png
index 4cf9f9c..4504569 100644
Binary files a/web/www/routino/icons/limit-0.6.png and b/web/www/routino/icons/limit-0.6.png differ
diff --git a/web/www/routino/icons/limit-0.7.png b/web/www/routino/icons/limit-0.7.png
index 86754ae..c101d76 100644
Binary files a/web/www/routino/icons/limit-0.7.png and b/web/www/routino/icons/limit-0.7.png differ
diff --git a/web/www/routino/icons/limit-0.8.png b/web/www/routino/icons/limit-0.8.png
index 765e219..0679cbe 100644
Binary files a/web/www/routino/icons/limit-0.8.png and b/web/www/routino/icons/limit-0.8.png differ
diff --git a/web/www/routino/icons/limit-0.9.png b/web/www/routino/icons/limit-0.9.png
index a89d6e4..a105607 100644
Binary files a/web/www/routino/icons/limit-0.9.png and b/web/www/routino/icons/limit-0.9.png differ
diff --git a/web/www/routino/icons/limit-0.png b/web/www/routino/icons/limit-0.png
index af89057..27ef86d 100644
Binary files a/web/www/routino/icons/limit-0.png and b/web/www/routino/icons/limit-0.png differ
diff --git a/web/www/routino/icons/limit-1.0.png b/web/www/routino/icons/limit-1.0.png
index b1876d5..c43de7e 100644
Binary files a/web/www/routino/icons/limit-1.0.png and b/web/www/routino/icons/limit-1.0.png differ
diff --git a/web/www/routino/icons/limit-1.1.png b/web/www/routino/icons/limit-1.1.png
index b5d0b7a..d389163 100644
Binary files a/web/www/routino/icons/limit-1.1.png and b/web/www/routino/icons/limit-1.1.png differ
diff --git a/web/www/routino/icons/limit-1.2.png b/web/www/routino/icons/limit-1.2.png
index d6c6663..3596ed6 100644
Binary files a/web/www/routino/icons/limit-1.2.png and b/web/www/routino/icons/limit-1.2.png differ
diff --git a/web/www/routino/icons/limit-1.3.png b/web/www/routino/icons/limit-1.3.png
index 2c08c17..f0e2cec 100644
Binary files a/web/www/routino/icons/limit-1.3.png and b/web/www/routino/icons/limit-1.3.png differ
diff --git a/web/www/routino/icons/limit-1.4.png b/web/www/routino/icons/limit-1.4.png
index ce44249..f28bbfc 100644
Binary files a/web/www/routino/icons/limit-1.4.png and b/web/www/routino/icons/limit-1.4.png differ
diff --git a/web/www/routino/icons/limit-1.5.png b/web/www/routino/icons/limit-1.5.png
index d5771cd..31af439 100644
Binary files a/web/www/routino/icons/limit-1.5.png and b/web/www/routino/icons/limit-1.5.png differ
diff --git a/web/www/routino/icons/limit-1.6.png b/web/www/routino/icons/limit-1.6.png
index 253efe8..c68a9e5 100644
Binary files a/web/www/routino/icons/limit-1.6.png and b/web/www/routino/icons/limit-1.6.png differ
diff --git a/web/www/routino/icons/limit-1.7.png b/web/www/routino/icons/limit-1.7.png
index 50cee21..5bc4923 100644
Binary files a/web/www/routino/icons/limit-1.7.png and b/web/www/routino/icons/limit-1.7.png differ
diff --git a/web/www/routino/icons/limit-1.8.png b/web/www/routino/icons/limit-1.8.png
index ae3c3f4..09f1ec5 100644
Binary files a/web/www/routino/icons/limit-1.8.png and b/web/www/routino/icons/limit-1.8.png differ
diff --git a/web/www/routino/icons/limit-1.9.png b/web/www/routino/icons/limit-1.9.png
index f0621c1..4180f6f 100644
Binary files a/web/www/routino/icons/limit-1.9.png and b/web/www/routino/icons/limit-1.9.png differ
diff --git a/web/www/routino/icons/limit-1.png b/web/www/routino/icons/limit-1.png
index 7503700..799487c 100644
Binary files a/web/www/routino/icons/limit-1.png and b/web/www/routino/icons/limit-1.png differ
diff --git a/web/www/routino/icons/limit-10.0.png b/web/www/routino/icons/limit-10.0.png
index 5e225ff..219c0c2 100644
Binary files a/web/www/routino/icons/limit-10.0.png and b/web/www/routino/icons/limit-10.0.png differ
diff --git a/web/www/routino/icons/limit-10.1.png b/web/www/routino/icons/limit-10.1.png
index 4f175f6..63aa07f 100644
Binary files a/web/www/routino/icons/limit-10.1.png and b/web/www/routino/icons/limit-10.1.png differ
diff --git a/web/www/routino/icons/limit-10.2.png b/web/www/routino/icons/limit-10.2.png
index 7bd264c..074001f 100644
Binary files a/web/www/routino/icons/limit-10.2.png and b/web/www/routino/icons/limit-10.2.png differ
diff --git a/web/www/routino/icons/limit-10.3.png b/web/www/routino/icons/limit-10.3.png
index 9f2d919..cf80c91 100644
Binary files a/web/www/routino/icons/limit-10.3.png and b/web/www/routino/icons/limit-10.3.png differ
diff --git a/web/www/routino/icons/limit-10.4.png b/web/www/routino/icons/limit-10.4.png
index b3eecc5..9e63fdc 100644
Binary files a/web/www/routino/icons/limit-10.4.png and b/web/www/routino/icons/limit-10.4.png differ
diff --git a/web/www/routino/icons/limit-10.5.png b/web/www/routino/icons/limit-10.5.png
index 6417587..601c9c8 100644
Binary files a/web/www/routino/icons/limit-10.5.png and b/web/www/routino/icons/limit-10.5.png differ
diff --git a/web/www/routino/icons/limit-10.6.png b/web/www/routino/icons/limit-10.6.png
index b1241a4..51b0235 100644
Binary files a/web/www/routino/icons/limit-10.6.png and b/web/www/routino/icons/limit-10.6.png differ
diff --git a/web/www/routino/icons/limit-10.7.png b/web/www/routino/icons/limit-10.7.png
index 2a9f18e..c5b645e 100644
Binary files a/web/www/routino/icons/limit-10.7.png and b/web/www/routino/icons/limit-10.7.png differ
diff --git a/web/www/routino/icons/limit-10.8.png b/web/www/routino/icons/limit-10.8.png
index 5ff0984..487243d 100644
Binary files a/web/www/routino/icons/limit-10.8.png and b/web/www/routino/icons/limit-10.8.png differ
diff --git a/web/www/routino/icons/limit-10.9.png b/web/www/routino/icons/limit-10.9.png
index 57ee7a2..8eea86f 100644
Binary files a/web/www/routino/icons/limit-10.9.png and b/web/www/routino/icons/limit-10.9.png differ
diff --git a/web/www/routino/icons/limit-10.png b/web/www/routino/icons/limit-10.png
index 63b58a3..13f5bf8 100644
Binary files a/web/www/routino/icons/limit-10.png and b/web/www/routino/icons/limit-10.png differ
diff --git a/web/www/routino/icons/limit-100.png b/web/www/routino/icons/limit-100.png
index e43edf2..ca9de47 100644
Binary files a/web/www/routino/icons/limit-100.png and b/web/www/routino/icons/limit-100.png differ
diff --git a/web/www/routino/icons/limit-101.png b/web/www/routino/icons/limit-101.png
index f2a8f11..dbe9b9f 100644
Binary files a/web/www/routino/icons/limit-101.png and b/web/www/routino/icons/limit-101.png differ
diff --git a/web/www/routino/icons/limit-102.png b/web/www/routino/icons/limit-102.png
index d9b1017..994a2b1 100644
Binary files a/web/www/routino/icons/limit-102.png and b/web/www/routino/icons/limit-102.png differ
diff --git a/web/www/routino/icons/limit-103.png b/web/www/routino/icons/limit-103.png
index e716e6c..758daf3 100644
Binary files a/web/www/routino/icons/limit-103.png and b/web/www/routino/icons/limit-103.png differ
diff --git a/web/www/routino/icons/limit-104.png b/web/www/routino/icons/limit-104.png
index 13bfdcc..395773b 100644
Binary files a/web/www/routino/icons/limit-104.png and b/web/www/routino/icons/limit-104.png differ
diff --git a/web/www/routino/icons/limit-105.png b/web/www/routino/icons/limit-105.png
index 1605e06..6349123 100644
Binary files a/web/www/routino/icons/limit-105.png and b/web/www/routino/icons/limit-105.png differ
diff --git a/web/www/routino/icons/limit-106.png b/web/www/routino/icons/limit-106.png
index 9cf2c43..9aa604a 100644
Binary files a/web/www/routino/icons/limit-106.png and b/web/www/routino/icons/limit-106.png differ
diff --git a/web/www/routino/icons/limit-107.png b/web/www/routino/icons/limit-107.png
index 4cb89f1..aa74357 100644
Binary files a/web/www/routino/icons/limit-107.png and b/web/www/routino/icons/limit-107.png differ
diff --git a/web/www/routino/icons/limit-108.png b/web/www/routino/icons/limit-108.png
index 106ce23..e7f5102 100644
Binary files a/web/www/routino/icons/limit-108.png and b/web/www/routino/icons/limit-108.png differ
diff --git a/web/www/routino/icons/limit-109.png b/web/www/routino/icons/limit-109.png
index d8cb5c3..c8e457f 100644
Binary files a/web/www/routino/icons/limit-109.png and b/web/www/routino/icons/limit-109.png differ
diff --git a/web/www/routino/icons/limit-11.0.png b/web/www/routino/icons/limit-11.0.png
index 51b7751..00c1493 100644
Binary files a/web/www/routino/icons/limit-11.0.png and b/web/www/routino/icons/limit-11.0.png differ
diff --git a/web/www/routino/icons/limit-11.1.png b/web/www/routino/icons/limit-11.1.png
index c0d1445..344bf2d 100644
Binary files a/web/www/routino/icons/limit-11.1.png and b/web/www/routino/icons/limit-11.1.png differ
diff --git a/web/www/routino/icons/limit-11.2.png b/web/www/routino/icons/limit-11.2.png
index 0ed7998..b98b3af 100644
Binary files a/web/www/routino/icons/limit-11.2.png and b/web/www/routino/icons/limit-11.2.png differ
diff --git a/web/www/routino/icons/limit-11.3.png b/web/www/routino/icons/limit-11.3.png
index e5096fa..002b45a 100644
Binary files a/web/www/routino/icons/limit-11.3.png and b/web/www/routino/icons/limit-11.3.png differ
diff --git a/web/www/routino/icons/limit-11.4.png b/web/www/routino/icons/limit-11.4.png
index 5a5ed88..ab80a64 100644
Binary files a/web/www/routino/icons/limit-11.4.png and b/web/www/routino/icons/limit-11.4.png differ
diff --git a/web/www/routino/icons/limit-11.5.png b/web/www/routino/icons/limit-11.5.png
index 95e0395..ae6cd09 100644
Binary files a/web/www/routino/icons/limit-11.5.png and b/web/www/routino/icons/limit-11.5.png differ
diff --git a/web/www/routino/icons/limit-11.6.png b/web/www/routino/icons/limit-11.6.png
index 4957414..d9c828e 100644
Binary files a/web/www/routino/icons/limit-11.6.png and b/web/www/routino/icons/limit-11.6.png differ
diff --git a/web/www/routino/icons/limit-11.7.png b/web/www/routino/icons/limit-11.7.png
index 0ef70ce..6ee8070 100644
Binary files a/web/www/routino/icons/limit-11.7.png and b/web/www/routino/icons/limit-11.7.png differ
diff --git a/web/www/routino/icons/limit-11.8.png b/web/www/routino/icons/limit-11.8.png
index e68bfc0..0e5e638 100644
Binary files a/web/www/routino/icons/limit-11.8.png and b/web/www/routino/icons/limit-11.8.png differ
diff --git a/web/www/routino/icons/limit-11.9.png b/web/www/routino/icons/limit-11.9.png
index 91c594a..14349da 100644
Binary files a/web/www/routino/icons/limit-11.9.png and b/web/www/routino/icons/limit-11.9.png differ
diff --git a/web/www/routino/icons/limit-11.png b/web/www/routino/icons/limit-11.png
index f453a40..32d5655 100644
Binary files a/web/www/routino/icons/limit-11.png and b/web/www/routino/icons/limit-11.png differ
diff --git a/web/www/routino/icons/limit-110.png b/web/www/routino/icons/limit-110.png
index d1395fb..e98039f 100644
Binary files a/web/www/routino/icons/limit-110.png and b/web/www/routino/icons/limit-110.png differ
diff --git a/web/www/routino/icons/limit-111.png b/web/www/routino/icons/limit-111.png
index bb9679c..da4a7e4 100644
Binary files a/web/www/routino/icons/limit-111.png and b/web/www/routino/icons/limit-111.png differ
diff --git a/web/www/routino/icons/limit-112.png b/web/www/routino/icons/limit-112.png
index c07ec19..f1aeb5f 100644
Binary files a/web/www/routino/icons/limit-112.png and b/web/www/routino/icons/limit-112.png differ
diff --git a/web/www/routino/icons/limit-113.png b/web/www/routino/icons/limit-113.png
index bfce227..822fe8f 100644
Binary files a/web/www/routino/icons/limit-113.png and b/web/www/routino/icons/limit-113.png differ
diff --git a/web/www/routino/icons/limit-114.png b/web/www/routino/icons/limit-114.png
index f4c6ebb..3d15190 100644
Binary files a/web/www/routino/icons/limit-114.png and b/web/www/routino/icons/limit-114.png differ
diff --git a/web/www/routino/icons/limit-115.png b/web/www/routino/icons/limit-115.png
index a9f8887..7ad4c88 100644
Binary files a/web/www/routino/icons/limit-115.png and b/web/www/routino/icons/limit-115.png differ
diff --git a/web/www/routino/icons/limit-116.png b/web/www/routino/icons/limit-116.png
index e088a3b..82c46c8 100644
Binary files a/web/www/routino/icons/limit-116.png and b/web/www/routino/icons/limit-116.png differ
diff --git a/web/www/routino/icons/limit-117.png b/web/www/routino/icons/limit-117.png
index 775c1b6..486f9f8 100644
Binary files a/web/www/routino/icons/limit-117.png and b/web/www/routino/icons/limit-117.png differ
diff --git a/web/www/routino/icons/limit-118.png b/web/www/routino/icons/limit-118.png
index 691d35c..84563d7 100644
Binary files a/web/www/routino/icons/limit-118.png and b/web/www/routino/icons/limit-118.png differ
diff --git a/web/www/routino/icons/limit-119.png b/web/www/routino/icons/limit-119.png
index 86cdf84..840c912 100644
Binary files a/web/www/routino/icons/limit-119.png and b/web/www/routino/icons/limit-119.png differ
diff --git a/web/www/routino/icons/limit-12.0.png b/web/www/routino/icons/limit-12.0.png
index 5d9c8a3..95518ce 100644
Binary files a/web/www/routino/icons/limit-12.0.png and b/web/www/routino/icons/limit-12.0.png differ
diff --git a/web/www/routino/icons/limit-12.1.png b/web/www/routino/icons/limit-12.1.png
index 257cce9..50da46a 100644
Binary files a/web/www/routino/icons/limit-12.1.png and b/web/www/routino/icons/limit-12.1.png differ
diff --git a/web/www/routino/icons/limit-12.2.png b/web/www/routino/icons/limit-12.2.png
index 57fdfaf..451887e 100644
Binary files a/web/www/routino/icons/limit-12.2.png and b/web/www/routino/icons/limit-12.2.png differ
diff --git a/web/www/routino/icons/limit-12.3.png b/web/www/routino/icons/limit-12.3.png
index 33928f4..2b97acf 100644
Binary files a/web/www/routino/icons/limit-12.3.png and b/web/www/routino/icons/limit-12.3.png differ
diff --git a/web/www/routino/icons/limit-12.4.png b/web/www/routino/icons/limit-12.4.png
index d2e8b8c..0a72bc4 100644
Binary files a/web/www/routino/icons/limit-12.4.png and b/web/www/routino/icons/limit-12.4.png differ
diff --git a/web/www/routino/icons/limit-12.5.png b/web/www/routino/icons/limit-12.5.png
index c0801fd..b88d652 100644
Binary files a/web/www/routino/icons/limit-12.5.png and b/web/www/routino/icons/limit-12.5.png differ
diff --git a/web/www/routino/icons/limit-12.6.png b/web/www/routino/icons/limit-12.6.png
index 39998e2..cc75512 100644
Binary files a/web/www/routino/icons/limit-12.6.png and b/web/www/routino/icons/limit-12.6.png differ
diff --git a/web/www/routino/icons/limit-12.7.png b/web/www/routino/icons/limit-12.7.png
index dfdd9a4..1a2992f 100644
Binary files a/web/www/routino/icons/limit-12.7.png and b/web/www/routino/icons/limit-12.7.png differ
diff --git a/web/www/routino/icons/limit-12.8.png b/web/www/routino/icons/limit-12.8.png
index b7e1718..1930079 100644
Binary files a/web/www/routino/icons/limit-12.8.png and b/web/www/routino/icons/limit-12.8.png differ
diff --git a/web/www/routino/icons/limit-12.9.png b/web/www/routino/icons/limit-12.9.png
index df5c7ce..119b985 100644
Binary files a/web/www/routino/icons/limit-12.9.png and b/web/www/routino/icons/limit-12.9.png differ
diff --git a/web/www/routino/icons/limit-12.png b/web/www/routino/icons/limit-12.png
index c6d0219..97b3393 100644
Binary files a/web/www/routino/icons/limit-12.png and b/web/www/routino/icons/limit-12.png differ
diff --git a/web/www/routino/icons/limit-120.png b/web/www/routino/icons/limit-120.png
index b4fe6b4..ba3265d 100644
Binary files a/web/www/routino/icons/limit-120.png and b/web/www/routino/icons/limit-120.png differ
diff --git a/web/www/routino/icons/limit-121.png b/web/www/routino/icons/limit-121.png
index 56adcda..638b3c8 100644
Binary files a/web/www/routino/icons/limit-121.png and b/web/www/routino/icons/limit-121.png differ
diff --git a/web/www/routino/icons/limit-122.png b/web/www/routino/icons/limit-122.png
index 488b223..0cc5439 100644
Binary files a/web/www/routino/icons/limit-122.png and b/web/www/routino/icons/limit-122.png differ
diff --git a/web/www/routino/icons/limit-123.png b/web/www/routino/icons/limit-123.png
index 6366729..6dc3b72 100644
Binary files a/web/www/routino/icons/limit-123.png and b/web/www/routino/icons/limit-123.png differ
diff --git a/web/www/routino/icons/limit-124.png b/web/www/routino/icons/limit-124.png
index a9d01a5..4ea9d97 100644
Binary files a/web/www/routino/icons/limit-124.png and b/web/www/routino/icons/limit-124.png differ
diff --git a/web/www/routino/icons/limit-125.png b/web/www/routino/icons/limit-125.png
index 21d8143..808b514 100644
Binary files a/web/www/routino/icons/limit-125.png and b/web/www/routino/icons/limit-125.png differ
diff --git a/web/www/routino/icons/limit-126.png b/web/www/routino/icons/limit-126.png
index c46de1a..580470d 100644
Binary files a/web/www/routino/icons/limit-126.png and b/web/www/routino/icons/limit-126.png differ
diff --git a/web/www/routino/icons/limit-127.png b/web/www/routino/icons/limit-127.png
index 4aa7cf1..04bd7d3 100644
Binary files a/web/www/routino/icons/limit-127.png and b/web/www/routino/icons/limit-127.png differ
diff --git a/web/www/routino/icons/limit-128.png b/web/www/routino/icons/limit-128.png
index 2af4bbe..8c5a682 100644
Binary files a/web/www/routino/icons/limit-128.png and b/web/www/routino/icons/limit-128.png differ
diff --git a/web/www/routino/icons/limit-129.png b/web/www/routino/icons/limit-129.png
index aeba367..b38a27e 100644
Binary files a/web/www/routino/icons/limit-129.png and b/web/www/routino/icons/limit-129.png differ
diff --git a/web/www/routino/icons/limit-13.0.png b/web/www/routino/icons/limit-13.0.png
index bd778dd..0cf97c4 100644
Binary files a/web/www/routino/icons/limit-13.0.png and b/web/www/routino/icons/limit-13.0.png differ
diff --git a/web/www/routino/icons/limit-13.1.png b/web/www/routino/icons/limit-13.1.png
index 518545c..b935ef0 100644
Binary files a/web/www/routino/icons/limit-13.1.png and b/web/www/routino/icons/limit-13.1.png differ
diff --git a/web/www/routino/icons/limit-13.2.png b/web/www/routino/icons/limit-13.2.png
index 2213224..73b0e6b 100644
Binary files a/web/www/routino/icons/limit-13.2.png and b/web/www/routino/icons/limit-13.2.png differ
diff --git a/web/www/routino/icons/limit-13.3.png b/web/www/routino/icons/limit-13.3.png
index f95ce11..96d14b7 100644
Binary files a/web/www/routino/icons/limit-13.3.png and b/web/www/routino/icons/limit-13.3.png differ
diff --git a/web/www/routino/icons/limit-13.4.png b/web/www/routino/icons/limit-13.4.png
index ae97e99..b3e53ea 100644
Binary files a/web/www/routino/icons/limit-13.4.png and b/web/www/routino/icons/limit-13.4.png differ
diff --git a/web/www/routino/icons/limit-13.5.png b/web/www/routino/icons/limit-13.5.png
index 5463c9e..019006d 100644
Binary files a/web/www/routino/icons/limit-13.5.png and b/web/www/routino/icons/limit-13.5.png differ
diff --git a/web/www/routino/icons/limit-13.6.png b/web/www/routino/icons/limit-13.6.png
index 54d1888..390e418 100644
Binary files a/web/www/routino/icons/limit-13.6.png and b/web/www/routino/icons/limit-13.6.png differ
diff --git a/web/www/routino/icons/limit-13.7.png b/web/www/routino/icons/limit-13.7.png
index bc943c4..a3aceb2 100644
Binary files a/web/www/routino/icons/limit-13.7.png and b/web/www/routino/icons/limit-13.7.png differ
diff --git a/web/www/routino/icons/limit-13.8.png b/web/www/routino/icons/limit-13.8.png
index dc42c31..9290d80 100644
Binary files a/web/www/routino/icons/limit-13.8.png and b/web/www/routino/icons/limit-13.8.png differ
diff --git a/web/www/routino/icons/limit-13.9.png b/web/www/routino/icons/limit-13.9.png
index 0e539c9..aeab35a 100644
Binary files a/web/www/routino/icons/limit-13.9.png and b/web/www/routino/icons/limit-13.9.png differ
diff --git a/web/www/routino/icons/limit-13.png b/web/www/routino/icons/limit-13.png
index 584f284..4cfb929 100644
Binary files a/web/www/routino/icons/limit-13.png and b/web/www/routino/icons/limit-13.png differ
diff --git a/web/www/routino/icons/limit-130.png b/web/www/routino/icons/limit-130.png
index 5ad6f8c..944e1e6 100644
Binary files a/web/www/routino/icons/limit-130.png and b/web/www/routino/icons/limit-130.png differ
diff --git a/web/www/routino/icons/limit-131.png b/web/www/routino/icons/limit-131.png
index bc5ae9c..706ee81 100644
Binary files a/web/www/routino/icons/limit-131.png and b/web/www/routino/icons/limit-131.png differ
diff --git a/web/www/routino/icons/limit-132.png b/web/www/routino/icons/limit-132.png
index b72242e..8b7c7c1 100644
Binary files a/web/www/routino/icons/limit-132.png and b/web/www/routino/icons/limit-132.png differ
diff --git a/web/www/routino/icons/limit-133.png b/web/www/routino/icons/limit-133.png
index f3c37c8..7eb9a9f 100644
Binary files a/web/www/routino/icons/limit-133.png and b/web/www/routino/icons/limit-133.png differ
diff --git a/web/www/routino/icons/limit-134.png b/web/www/routino/icons/limit-134.png
index 9a9bcb2..fd283bf 100644
Binary files a/web/www/routino/icons/limit-134.png and b/web/www/routino/icons/limit-134.png differ
diff --git a/web/www/routino/icons/limit-135.png b/web/www/routino/icons/limit-135.png
index 0af6888..5244fe0 100644
Binary files a/web/www/routino/icons/limit-135.png and b/web/www/routino/icons/limit-135.png differ
diff --git a/web/www/routino/icons/limit-136.png b/web/www/routino/icons/limit-136.png
index 51fdf14..5219a49 100644
Binary files a/web/www/routino/icons/limit-136.png and b/web/www/routino/icons/limit-136.png differ
diff --git a/web/www/routino/icons/limit-137.png b/web/www/routino/icons/limit-137.png
index 2546570..9007823 100644
Binary files a/web/www/routino/icons/limit-137.png and b/web/www/routino/icons/limit-137.png differ
diff --git a/web/www/routino/icons/limit-138.png b/web/www/routino/icons/limit-138.png
index 51e6472..29ff8a4 100644
Binary files a/web/www/routino/icons/limit-138.png and b/web/www/routino/icons/limit-138.png differ
diff --git a/web/www/routino/icons/limit-139.png b/web/www/routino/icons/limit-139.png
index fbdbed9..c45317c 100644
Binary files a/web/www/routino/icons/limit-139.png and b/web/www/routino/icons/limit-139.png differ
diff --git a/web/www/routino/icons/limit-14.0.png b/web/www/routino/icons/limit-14.0.png
index 43059a1..308fc0b 100644
Binary files a/web/www/routino/icons/limit-14.0.png and b/web/www/routino/icons/limit-14.0.png differ
diff --git a/web/www/routino/icons/limit-14.1.png b/web/www/routino/icons/limit-14.1.png
index b8246e5..cab2ec9 100644
Binary files a/web/www/routino/icons/limit-14.1.png and b/web/www/routino/icons/limit-14.1.png differ
diff --git a/web/www/routino/icons/limit-14.2.png b/web/www/routino/icons/limit-14.2.png
index 526cf34..5ee7fdc 100644
Binary files a/web/www/routino/icons/limit-14.2.png and b/web/www/routino/icons/limit-14.2.png differ
diff --git a/web/www/routino/icons/limit-14.3.png b/web/www/routino/icons/limit-14.3.png
index 74aa242..5f4e190 100644
Binary files a/web/www/routino/icons/limit-14.3.png and b/web/www/routino/icons/limit-14.3.png differ
diff --git a/web/www/routino/icons/limit-14.4.png b/web/www/routino/icons/limit-14.4.png
index ffd6d8a..da66f1b 100644
Binary files a/web/www/routino/icons/limit-14.4.png and b/web/www/routino/icons/limit-14.4.png differ
diff --git a/web/www/routino/icons/limit-14.5.png b/web/www/routino/icons/limit-14.5.png
index 728adfb..fe22a03 100644
Binary files a/web/www/routino/icons/limit-14.5.png and b/web/www/routino/icons/limit-14.5.png differ
diff --git a/web/www/routino/icons/limit-14.6.png b/web/www/routino/icons/limit-14.6.png
index 35a3acf..3b847f5 100644
Binary files a/web/www/routino/icons/limit-14.6.png and b/web/www/routino/icons/limit-14.6.png differ
diff --git a/web/www/routino/icons/limit-14.7.png b/web/www/routino/icons/limit-14.7.png
index 7c983fe..63ea085 100644
Binary files a/web/www/routino/icons/limit-14.7.png and b/web/www/routino/icons/limit-14.7.png differ
diff --git a/web/www/routino/icons/limit-14.8.png b/web/www/routino/icons/limit-14.8.png
index a5a99b7..f409ab8 100644
Binary files a/web/www/routino/icons/limit-14.8.png and b/web/www/routino/icons/limit-14.8.png differ
diff --git a/web/www/routino/icons/limit-14.9.png b/web/www/routino/icons/limit-14.9.png
index 9cf32c8..322058d 100644
Binary files a/web/www/routino/icons/limit-14.9.png and b/web/www/routino/icons/limit-14.9.png differ
diff --git a/web/www/routino/icons/limit-14.png b/web/www/routino/icons/limit-14.png
index 31dd116..463d522 100644
Binary files a/web/www/routino/icons/limit-14.png and b/web/www/routino/icons/limit-14.png differ
diff --git a/web/www/routino/icons/limit-140.png b/web/www/routino/icons/limit-140.png
index cdae9a3..3f559da 100644
Binary files a/web/www/routino/icons/limit-140.png and b/web/www/routino/icons/limit-140.png differ
diff --git a/web/www/routino/icons/limit-141.png b/web/www/routino/icons/limit-141.png
index ef8cf4b..6d8e215 100644
Binary files a/web/www/routino/icons/limit-141.png and b/web/www/routino/icons/limit-141.png differ
diff --git a/web/www/routino/icons/limit-142.png b/web/www/routino/icons/limit-142.png
index 9617b22..eb3390a 100644
Binary files a/web/www/routino/icons/limit-142.png and b/web/www/routino/icons/limit-142.png differ
diff --git a/web/www/routino/icons/limit-143.png b/web/www/routino/icons/limit-143.png
index 8581df3..6f45319 100644
Binary files a/web/www/routino/icons/limit-143.png and b/web/www/routino/icons/limit-143.png differ
diff --git a/web/www/routino/icons/limit-144.png b/web/www/routino/icons/limit-144.png
index 03ed2a9..0292d7f 100644
Binary files a/web/www/routino/icons/limit-144.png and b/web/www/routino/icons/limit-144.png differ
diff --git a/web/www/routino/icons/limit-145.png b/web/www/routino/icons/limit-145.png
index 1fe2726..8a031a0 100644
Binary files a/web/www/routino/icons/limit-145.png and b/web/www/routino/icons/limit-145.png differ
diff --git a/web/www/routino/icons/limit-146.png b/web/www/routino/icons/limit-146.png
index b2d3dcc..e6e430e 100644
Binary files a/web/www/routino/icons/limit-146.png and b/web/www/routino/icons/limit-146.png differ
diff --git a/web/www/routino/icons/limit-147.png b/web/www/routino/icons/limit-147.png
index 41febc7..d1001a1 100644
Binary files a/web/www/routino/icons/limit-147.png and b/web/www/routino/icons/limit-147.png differ
diff --git a/web/www/routino/icons/limit-148.png b/web/www/routino/icons/limit-148.png
index 24cd6d0..3f408a8 100644
Binary files a/web/www/routino/icons/limit-148.png and b/web/www/routino/icons/limit-148.png differ
diff --git a/web/www/routino/icons/limit-149.png b/web/www/routino/icons/limit-149.png
index 37f8ad0..9ab43f6 100644
Binary files a/web/www/routino/icons/limit-149.png and b/web/www/routino/icons/limit-149.png differ
diff --git a/web/www/routino/icons/limit-15.0.png b/web/www/routino/icons/limit-15.0.png
index 2f1bb7a..971f234 100644
Binary files a/web/www/routino/icons/limit-15.0.png and b/web/www/routino/icons/limit-15.0.png differ
diff --git a/web/www/routino/icons/limit-15.1.png b/web/www/routino/icons/limit-15.1.png
index de3299c..bd07fcd 100644
Binary files a/web/www/routino/icons/limit-15.1.png and b/web/www/routino/icons/limit-15.1.png differ
diff --git a/web/www/routino/icons/limit-15.2.png b/web/www/routino/icons/limit-15.2.png
index 6b820a9..c4b90b4 100644
Binary files a/web/www/routino/icons/limit-15.2.png and b/web/www/routino/icons/limit-15.2.png differ
diff --git a/web/www/routino/icons/limit-15.3.png b/web/www/routino/icons/limit-15.3.png
index e4e27a5..19e7ce3 100644
Binary files a/web/www/routino/icons/limit-15.3.png and b/web/www/routino/icons/limit-15.3.png differ
diff --git a/web/www/routino/icons/limit-15.4.png b/web/www/routino/icons/limit-15.4.png
index fa73d85..00e1943 100644
Binary files a/web/www/routino/icons/limit-15.4.png and b/web/www/routino/icons/limit-15.4.png differ
diff --git a/web/www/routino/icons/limit-15.5.png b/web/www/routino/icons/limit-15.5.png
index 4495b8d..8f896f4 100644
Binary files a/web/www/routino/icons/limit-15.5.png and b/web/www/routino/icons/limit-15.5.png differ
diff --git a/web/www/routino/icons/limit-15.6.png b/web/www/routino/icons/limit-15.6.png
index f25f53d..8fe5d9a 100644
Binary files a/web/www/routino/icons/limit-15.6.png and b/web/www/routino/icons/limit-15.6.png differ
diff --git a/web/www/routino/icons/limit-15.7.png b/web/www/routino/icons/limit-15.7.png
index e85d239..060ebe2 100644
Binary files a/web/www/routino/icons/limit-15.7.png and b/web/www/routino/icons/limit-15.7.png differ
diff --git a/web/www/routino/icons/limit-15.8.png b/web/www/routino/icons/limit-15.8.png
index df0078f..94e67dd 100644
Binary files a/web/www/routino/icons/limit-15.8.png and b/web/www/routino/icons/limit-15.8.png differ
diff --git a/web/www/routino/icons/limit-15.9.png b/web/www/routino/icons/limit-15.9.png
index 2dceffa..c5554f8 100644
Binary files a/web/www/routino/icons/limit-15.9.png and b/web/www/routino/icons/limit-15.9.png differ
diff --git a/web/www/routino/icons/limit-15.png b/web/www/routino/icons/limit-15.png
index cd8f10b..e03ad1d 100644
Binary files a/web/www/routino/icons/limit-15.png and b/web/www/routino/icons/limit-15.png differ
diff --git a/web/www/routino/icons/limit-150.png b/web/www/routino/icons/limit-150.png
index 3dabfd8..89d29e6 100644
Binary files a/web/www/routino/icons/limit-150.png and b/web/www/routino/icons/limit-150.png differ
diff --git a/web/www/routino/icons/limit-151.png b/web/www/routino/icons/limit-151.png
index 9607d73..513eb9d 100644
Binary files a/web/www/routino/icons/limit-151.png and b/web/www/routino/icons/limit-151.png differ
diff --git a/web/www/routino/icons/limit-152.png b/web/www/routino/icons/limit-152.png
index b2580d3..de26fac 100644
Binary files a/web/www/routino/icons/limit-152.png and b/web/www/routino/icons/limit-152.png differ
diff --git a/web/www/routino/icons/limit-153.png b/web/www/routino/icons/limit-153.png
index 85f2394..a476be0 100644
Binary files a/web/www/routino/icons/limit-153.png and b/web/www/routino/icons/limit-153.png differ
diff --git a/web/www/routino/icons/limit-154.png b/web/www/routino/icons/limit-154.png
index 247c90e..c7aebb1 100644
Binary files a/web/www/routino/icons/limit-154.png and b/web/www/routino/icons/limit-154.png differ
diff --git a/web/www/routino/icons/limit-155.png b/web/www/routino/icons/limit-155.png
index ae2659e..1b9a7df 100644
Binary files a/web/www/routino/icons/limit-155.png and b/web/www/routino/icons/limit-155.png differ
diff --git a/web/www/routino/icons/limit-156.png b/web/www/routino/icons/limit-156.png
index 373be0d..79d04a3 100644
Binary files a/web/www/routino/icons/limit-156.png and b/web/www/routino/icons/limit-156.png differ
diff --git a/web/www/routino/icons/limit-157.png b/web/www/routino/icons/limit-157.png
index 4de8596..0df662a 100644
Binary files a/web/www/routino/icons/limit-157.png and b/web/www/routino/icons/limit-157.png differ
diff --git a/web/www/routino/icons/limit-158.png b/web/www/routino/icons/limit-158.png
index 7dcce16..c01e1ea 100644
Binary files a/web/www/routino/icons/limit-158.png and b/web/www/routino/icons/limit-158.png differ
diff --git a/web/www/routino/icons/limit-159.png b/web/www/routino/icons/limit-159.png
index c6bd136..2df0931 100644
Binary files a/web/www/routino/icons/limit-159.png and b/web/www/routino/icons/limit-159.png differ
diff --git a/web/www/routino/icons/limit-16.0.png b/web/www/routino/icons/limit-16.0.png
index 242b00b..75e0fe0 100644
Binary files a/web/www/routino/icons/limit-16.0.png and b/web/www/routino/icons/limit-16.0.png differ
diff --git a/web/www/routino/icons/limit-16.1.png b/web/www/routino/icons/limit-16.1.png
index 81f5484..fc3a234 100644
Binary files a/web/www/routino/icons/limit-16.1.png and b/web/www/routino/icons/limit-16.1.png differ
diff --git a/web/www/routino/icons/limit-16.2.png b/web/www/routino/icons/limit-16.2.png
index 3c0af32..5ab1e16 100644
Binary files a/web/www/routino/icons/limit-16.2.png and b/web/www/routino/icons/limit-16.2.png differ
diff --git a/web/www/routino/icons/limit-16.3.png b/web/www/routino/icons/limit-16.3.png
index 057ef2d..0b191d7 100644
Binary files a/web/www/routino/icons/limit-16.3.png and b/web/www/routino/icons/limit-16.3.png differ
diff --git a/web/www/routino/icons/limit-16.4.png b/web/www/routino/icons/limit-16.4.png
index 01adf09..4300bf3 100644
Binary files a/web/www/routino/icons/limit-16.4.png and b/web/www/routino/icons/limit-16.4.png differ
diff --git a/web/www/routino/icons/limit-16.5.png b/web/www/routino/icons/limit-16.5.png
index 37e0d02..b2d94f3 100644
Binary files a/web/www/routino/icons/limit-16.5.png and b/web/www/routino/icons/limit-16.5.png differ
diff --git a/web/www/routino/icons/limit-16.6.png b/web/www/routino/icons/limit-16.6.png
index 3944300..5ee65b3 100644
Binary files a/web/www/routino/icons/limit-16.6.png and b/web/www/routino/icons/limit-16.6.png differ
diff --git a/web/www/routino/icons/limit-16.7.png b/web/www/routino/icons/limit-16.7.png
index 920d49c..b2f98ab 100644
Binary files a/web/www/routino/icons/limit-16.7.png and b/web/www/routino/icons/limit-16.7.png differ
diff --git a/web/www/routino/icons/limit-16.8.png b/web/www/routino/icons/limit-16.8.png
index c1116c0..ca0e904 100644
Binary files a/web/www/routino/icons/limit-16.8.png and b/web/www/routino/icons/limit-16.8.png differ
diff --git a/web/www/routino/icons/limit-16.9.png b/web/www/routino/icons/limit-16.9.png
index 3fa64f8..df0b5af 100644
Binary files a/web/www/routino/icons/limit-16.9.png and b/web/www/routino/icons/limit-16.9.png differ
diff --git a/web/www/routino/icons/limit-16.png b/web/www/routino/icons/limit-16.png
index f7fc8f5..c563b2f 100644
Binary files a/web/www/routino/icons/limit-16.png and b/web/www/routino/icons/limit-16.png differ
diff --git a/web/www/routino/icons/limit-160.png b/web/www/routino/icons/limit-160.png
index a61b560..9176cea 100644
Binary files a/web/www/routino/icons/limit-160.png and b/web/www/routino/icons/limit-160.png differ
diff --git a/web/www/routino/icons/limit-161.png b/web/www/routino/icons/limit-161.png
index 9cb2a0c..920b29a 100644
Binary files a/web/www/routino/icons/limit-161.png and b/web/www/routino/icons/limit-161.png differ
diff --git a/web/www/routino/icons/limit-162.png b/web/www/routino/icons/limit-162.png
index 1b7ffae..986c3f3 100644
Binary files a/web/www/routino/icons/limit-162.png and b/web/www/routino/icons/limit-162.png differ
diff --git a/web/www/routino/icons/limit-163.png b/web/www/routino/icons/limit-163.png
index 760ef25..aa5e68b 100644
Binary files a/web/www/routino/icons/limit-163.png and b/web/www/routino/icons/limit-163.png differ
diff --git a/web/www/routino/icons/limit-164.png b/web/www/routino/icons/limit-164.png
index ed625d9..beae2ec 100644
Binary files a/web/www/routino/icons/limit-164.png and b/web/www/routino/icons/limit-164.png differ
diff --git a/web/www/routino/icons/limit-165.png b/web/www/routino/icons/limit-165.png
index cafc0d9..7b61de1 100644
Binary files a/web/www/routino/icons/limit-165.png and b/web/www/routino/icons/limit-165.png differ
diff --git a/web/www/routino/icons/limit-166.png b/web/www/routino/icons/limit-166.png
index 06de588..6719a51 100644
Binary files a/web/www/routino/icons/limit-166.png and b/web/www/routino/icons/limit-166.png differ
diff --git a/web/www/routino/icons/limit-167.png b/web/www/routino/icons/limit-167.png
index 88b2982..d24a3c6 100644
Binary files a/web/www/routino/icons/limit-167.png and b/web/www/routino/icons/limit-167.png differ
diff --git a/web/www/routino/icons/limit-168.png b/web/www/routino/icons/limit-168.png
index 8fac351..d998b21 100644
Binary files a/web/www/routino/icons/limit-168.png and b/web/www/routino/icons/limit-168.png differ
diff --git a/web/www/routino/icons/limit-169.png b/web/www/routino/icons/limit-169.png
index c730d98..85177ef 100644
Binary files a/web/www/routino/icons/limit-169.png and b/web/www/routino/icons/limit-169.png differ
diff --git a/web/www/routino/icons/limit-17.0.png b/web/www/routino/icons/limit-17.0.png
index 862a72c..dc4dcc0 100644
Binary files a/web/www/routino/icons/limit-17.0.png and b/web/www/routino/icons/limit-17.0.png differ
diff --git a/web/www/routino/icons/limit-17.1.png b/web/www/routino/icons/limit-17.1.png
index cb3fb19..551a7ef 100644
Binary files a/web/www/routino/icons/limit-17.1.png and b/web/www/routino/icons/limit-17.1.png differ
diff --git a/web/www/routino/icons/limit-17.2.png b/web/www/routino/icons/limit-17.2.png
index 680a8df..113d1d1 100644
Binary files a/web/www/routino/icons/limit-17.2.png and b/web/www/routino/icons/limit-17.2.png differ
diff --git a/web/www/routino/icons/limit-17.3.png b/web/www/routino/icons/limit-17.3.png
index 781176f..0ec6daa 100644
Binary files a/web/www/routino/icons/limit-17.3.png and b/web/www/routino/icons/limit-17.3.png differ
diff --git a/web/www/routino/icons/limit-17.4.png b/web/www/routino/icons/limit-17.4.png
index ed173c1..52fb373 100644
Binary files a/web/www/routino/icons/limit-17.4.png and b/web/www/routino/icons/limit-17.4.png differ
diff --git a/web/www/routino/icons/limit-17.5.png b/web/www/routino/icons/limit-17.5.png
index 6d8d3a6..5046078 100644
Binary files a/web/www/routino/icons/limit-17.5.png and b/web/www/routino/icons/limit-17.5.png differ
diff --git a/web/www/routino/icons/limit-17.6.png b/web/www/routino/icons/limit-17.6.png
index bceb277..fb50d85 100644
Binary files a/web/www/routino/icons/limit-17.6.png and b/web/www/routino/icons/limit-17.6.png differ
diff --git a/web/www/routino/icons/limit-17.7.png b/web/www/routino/icons/limit-17.7.png
index 68a8b73..f1256d9 100644
Binary files a/web/www/routino/icons/limit-17.7.png and b/web/www/routino/icons/limit-17.7.png differ
diff --git a/web/www/routino/icons/limit-17.8.png b/web/www/routino/icons/limit-17.8.png
index f4503fb..e0e665e 100644
Binary files a/web/www/routino/icons/limit-17.8.png and b/web/www/routino/icons/limit-17.8.png differ
diff --git a/web/www/routino/icons/limit-17.9.png b/web/www/routino/icons/limit-17.9.png
index 57a225c..29b2504 100644
Binary files a/web/www/routino/icons/limit-17.9.png and b/web/www/routino/icons/limit-17.9.png differ
diff --git a/web/www/routino/icons/limit-17.png b/web/www/routino/icons/limit-17.png
index af92cab..0ac33a9 100644
Binary files a/web/www/routino/icons/limit-17.png and b/web/www/routino/icons/limit-17.png differ
diff --git a/web/www/routino/icons/limit-170.png b/web/www/routino/icons/limit-170.png
index f8553d4..199e168 100644
Binary files a/web/www/routino/icons/limit-170.png and b/web/www/routino/icons/limit-170.png differ
diff --git a/web/www/routino/icons/limit-171.png b/web/www/routino/icons/limit-171.png
index 655a214..950df8a 100644
Binary files a/web/www/routino/icons/limit-171.png and b/web/www/routino/icons/limit-171.png differ
diff --git a/web/www/routino/icons/limit-172.png b/web/www/routino/icons/limit-172.png
index e9e2926..1a23663 100644
Binary files a/web/www/routino/icons/limit-172.png and b/web/www/routino/icons/limit-172.png differ
diff --git a/web/www/routino/icons/limit-173.png b/web/www/routino/icons/limit-173.png
index 62a0ba7..8fc4a75 100644
Binary files a/web/www/routino/icons/limit-173.png and b/web/www/routino/icons/limit-173.png differ
diff --git a/web/www/routino/icons/limit-174.png b/web/www/routino/icons/limit-174.png
index eca10c4..480ea99 100644
Binary files a/web/www/routino/icons/limit-174.png and b/web/www/routino/icons/limit-174.png differ
diff --git a/web/www/routino/icons/limit-175.png b/web/www/routino/icons/limit-175.png
index 8bb5168..e81950b 100644
Binary files a/web/www/routino/icons/limit-175.png and b/web/www/routino/icons/limit-175.png differ
diff --git a/web/www/routino/icons/limit-176.png b/web/www/routino/icons/limit-176.png
index aab4262..a24be20 100644
Binary files a/web/www/routino/icons/limit-176.png and b/web/www/routino/icons/limit-176.png differ
diff --git a/web/www/routino/icons/limit-177.png b/web/www/routino/icons/limit-177.png
index 9259148..75482f9 100644
Binary files a/web/www/routino/icons/limit-177.png and b/web/www/routino/icons/limit-177.png differ
diff --git a/web/www/routino/icons/limit-178.png b/web/www/routino/icons/limit-178.png
index a38ab1d..26df687 100644
Binary files a/web/www/routino/icons/limit-178.png and b/web/www/routino/icons/limit-178.png differ
diff --git a/web/www/routino/icons/limit-179.png b/web/www/routino/icons/limit-179.png
index bb05543..ec4d749 100644
Binary files a/web/www/routino/icons/limit-179.png and b/web/www/routino/icons/limit-179.png differ
diff --git a/web/www/routino/icons/limit-18.0.png b/web/www/routino/icons/limit-18.0.png
index 3b16a6c..7a3f1f7 100644
Binary files a/web/www/routino/icons/limit-18.0.png and b/web/www/routino/icons/limit-18.0.png differ
diff --git a/web/www/routino/icons/limit-18.1.png b/web/www/routino/icons/limit-18.1.png
index 76927bb..bf54667 100644
Binary files a/web/www/routino/icons/limit-18.1.png and b/web/www/routino/icons/limit-18.1.png differ
diff --git a/web/www/routino/icons/limit-18.2.png b/web/www/routino/icons/limit-18.2.png
index 5459fc9..05ed1b7 100644
Binary files a/web/www/routino/icons/limit-18.2.png and b/web/www/routino/icons/limit-18.2.png differ
diff --git a/web/www/routino/icons/limit-18.3.png b/web/www/routino/icons/limit-18.3.png
index b5d8630..4fe48b9 100644
Binary files a/web/www/routino/icons/limit-18.3.png and b/web/www/routino/icons/limit-18.3.png differ
diff --git a/web/www/routino/icons/limit-18.4.png b/web/www/routino/icons/limit-18.4.png
index 13f49b1..65ef5b0 100644
Binary files a/web/www/routino/icons/limit-18.4.png and b/web/www/routino/icons/limit-18.4.png differ
diff --git a/web/www/routino/icons/limit-18.5.png b/web/www/routino/icons/limit-18.5.png
index 4b1321f..44f6901 100644
Binary files a/web/www/routino/icons/limit-18.5.png and b/web/www/routino/icons/limit-18.5.png differ
diff --git a/web/www/routino/icons/limit-18.6.png b/web/www/routino/icons/limit-18.6.png
index 405fad8..f6bdc37 100644
Binary files a/web/www/routino/icons/limit-18.6.png and b/web/www/routino/icons/limit-18.6.png differ
diff --git a/web/www/routino/icons/limit-18.7.png b/web/www/routino/icons/limit-18.7.png
index 422fe6a..042ec8b 100644
Binary files a/web/www/routino/icons/limit-18.7.png and b/web/www/routino/icons/limit-18.7.png differ
diff --git a/web/www/routino/icons/limit-18.8.png b/web/www/routino/icons/limit-18.8.png
index e69d74a..03209f9 100644
Binary files a/web/www/routino/icons/limit-18.8.png and b/web/www/routino/icons/limit-18.8.png differ
diff --git a/web/www/routino/icons/limit-18.9.png b/web/www/routino/icons/limit-18.9.png
index a438706..510baeb 100644
Binary files a/web/www/routino/icons/limit-18.9.png and b/web/www/routino/icons/limit-18.9.png differ
diff --git a/web/www/routino/icons/limit-18.png b/web/www/routino/icons/limit-18.png
index 87491cc..4570c79 100644
Binary files a/web/www/routino/icons/limit-18.png and b/web/www/routino/icons/limit-18.png differ
diff --git a/web/www/routino/icons/limit-180.png b/web/www/routino/icons/limit-180.png
index 06a2b54..0cec92b 100644
Binary files a/web/www/routino/icons/limit-180.png and b/web/www/routino/icons/limit-180.png differ
diff --git a/web/www/routino/icons/limit-181.png b/web/www/routino/icons/limit-181.png
index 5d038fa..ab93827 100644
Binary files a/web/www/routino/icons/limit-181.png and b/web/www/routino/icons/limit-181.png differ
diff --git a/web/www/routino/icons/limit-182.png b/web/www/routino/icons/limit-182.png
index c67d93e..b5697d0 100644
Binary files a/web/www/routino/icons/limit-182.png and b/web/www/routino/icons/limit-182.png differ
diff --git a/web/www/routino/icons/limit-183.png b/web/www/routino/icons/limit-183.png
index 5c4a53d..09d3ea5 100644
Binary files a/web/www/routino/icons/limit-183.png and b/web/www/routino/icons/limit-183.png differ
diff --git a/web/www/routino/icons/limit-184.png b/web/www/routino/icons/limit-184.png
index 5c8fc1f..a6a1c9d 100644
Binary files a/web/www/routino/icons/limit-184.png and b/web/www/routino/icons/limit-184.png differ
diff --git a/web/www/routino/icons/limit-185.png b/web/www/routino/icons/limit-185.png
index 5b5944f..dfaba95 100644
Binary files a/web/www/routino/icons/limit-185.png and b/web/www/routino/icons/limit-185.png differ
diff --git a/web/www/routino/icons/limit-186.png b/web/www/routino/icons/limit-186.png
index f960a00..5484161 100644
Binary files a/web/www/routino/icons/limit-186.png and b/web/www/routino/icons/limit-186.png differ
diff --git a/web/www/routino/icons/limit-187.png b/web/www/routino/icons/limit-187.png
index c4e221a..40e00c2 100644
Binary files a/web/www/routino/icons/limit-187.png and b/web/www/routino/icons/limit-187.png differ
diff --git a/web/www/routino/icons/limit-188.png b/web/www/routino/icons/limit-188.png
index ed1ed0d..64200af 100644
Binary files a/web/www/routino/icons/limit-188.png and b/web/www/routino/icons/limit-188.png differ
diff --git a/web/www/routino/icons/limit-189.png b/web/www/routino/icons/limit-189.png
index b75a6d4..312aa9f 100644
Binary files a/web/www/routino/icons/limit-189.png and b/web/www/routino/icons/limit-189.png differ
diff --git a/web/www/routino/icons/limit-19.0.png b/web/www/routino/icons/limit-19.0.png
index ab997d4..1663715 100644
Binary files a/web/www/routino/icons/limit-19.0.png and b/web/www/routino/icons/limit-19.0.png differ
diff --git a/web/www/routino/icons/limit-19.1.png b/web/www/routino/icons/limit-19.1.png
index 4a1b500..9151a4c 100644
Binary files a/web/www/routino/icons/limit-19.1.png and b/web/www/routino/icons/limit-19.1.png differ
diff --git a/web/www/routino/icons/limit-19.2.png b/web/www/routino/icons/limit-19.2.png
index 2e10f9c..dcce893 100644
Binary files a/web/www/routino/icons/limit-19.2.png and b/web/www/routino/icons/limit-19.2.png differ
diff --git a/web/www/routino/icons/limit-19.3.png b/web/www/routino/icons/limit-19.3.png
index d38f0ab..3308958 100644
Binary files a/web/www/routino/icons/limit-19.3.png and b/web/www/routino/icons/limit-19.3.png differ
diff --git a/web/www/routino/icons/limit-19.4.png b/web/www/routino/icons/limit-19.4.png
index bf07f40..b5fbd56 100644
Binary files a/web/www/routino/icons/limit-19.4.png and b/web/www/routino/icons/limit-19.4.png differ
diff --git a/web/www/routino/icons/limit-19.5.png b/web/www/routino/icons/limit-19.5.png
index 3d9ce68..5e88e7d 100644
Binary files a/web/www/routino/icons/limit-19.5.png and b/web/www/routino/icons/limit-19.5.png differ
diff --git a/web/www/routino/icons/limit-19.6.png b/web/www/routino/icons/limit-19.6.png
index 4b700ea..ee82326 100644
Binary files a/web/www/routino/icons/limit-19.6.png and b/web/www/routino/icons/limit-19.6.png differ
diff --git a/web/www/routino/icons/limit-19.7.png b/web/www/routino/icons/limit-19.7.png
index 0809374..3879274 100644
Binary files a/web/www/routino/icons/limit-19.7.png and b/web/www/routino/icons/limit-19.7.png differ
diff --git a/web/www/routino/icons/limit-19.8.png b/web/www/routino/icons/limit-19.8.png
index 869c2f2..47d489d 100644
Binary files a/web/www/routino/icons/limit-19.8.png and b/web/www/routino/icons/limit-19.8.png differ
diff --git a/web/www/routino/icons/limit-19.9.png b/web/www/routino/icons/limit-19.9.png
index 100cb23..4e2e567 100644
Binary files a/web/www/routino/icons/limit-19.9.png and b/web/www/routino/icons/limit-19.9.png differ
diff --git a/web/www/routino/icons/limit-19.png b/web/www/routino/icons/limit-19.png
index caa83e9..ebc46ab 100644
Binary files a/web/www/routino/icons/limit-19.png and b/web/www/routino/icons/limit-19.png differ
diff --git a/web/www/routino/icons/limit-190.png b/web/www/routino/icons/limit-190.png
index dd2ae7a..550c026 100644
Binary files a/web/www/routino/icons/limit-190.png and b/web/www/routino/icons/limit-190.png differ
diff --git a/web/www/routino/icons/limit-191.png b/web/www/routino/icons/limit-191.png
index 56e399c..86e3338 100644
Binary files a/web/www/routino/icons/limit-191.png and b/web/www/routino/icons/limit-191.png differ
diff --git a/web/www/routino/icons/limit-192.png b/web/www/routino/icons/limit-192.png
index 8e60eae..44aa6e8 100644
Binary files a/web/www/routino/icons/limit-192.png and b/web/www/routino/icons/limit-192.png differ
diff --git a/web/www/routino/icons/limit-193.png b/web/www/routino/icons/limit-193.png
index 994462e..270c8eb 100644
Binary files a/web/www/routino/icons/limit-193.png and b/web/www/routino/icons/limit-193.png differ
diff --git a/web/www/routino/icons/limit-194.png b/web/www/routino/icons/limit-194.png
index 007680d..e73a820 100644
Binary files a/web/www/routino/icons/limit-194.png and b/web/www/routino/icons/limit-194.png differ
diff --git a/web/www/routino/icons/limit-195.png b/web/www/routino/icons/limit-195.png
index bebff92..d9dd160 100644
Binary files a/web/www/routino/icons/limit-195.png and b/web/www/routino/icons/limit-195.png differ
diff --git a/web/www/routino/icons/limit-196.png b/web/www/routino/icons/limit-196.png
index c715810..100b6cb 100644
Binary files a/web/www/routino/icons/limit-196.png and b/web/www/routino/icons/limit-196.png differ
diff --git a/web/www/routino/icons/limit-197.png b/web/www/routino/icons/limit-197.png
index 78d4cf7..fae5356 100644
Binary files a/web/www/routino/icons/limit-197.png and b/web/www/routino/icons/limit-197.png differ
diff --git a/web/www/routino/icons/limit-198.png b/web/www/routino/icons/limit-198.png
index 1934736..db4c240 100644
Binary files a/web/www/routino/icons/limit-198.png and b/web/www/routino/icons/limit-198.png differ
diff --git a/web/www/routino/icons/limit-199.png b/web/www/routino/icons/limit-199.png
index b51749a..0f9f541 100644
Binary files a/web/www/routino/icons/limit-199.png and b/web/www/routino/icons/limit-199.png differ
diff --git a/web/www/routino/icons/limit-2.0.png b/web/www/routino/icons/limit-2.0.png
index b99d337..bd7f0ad 100644
Binary files a/web/www/routino/icons/limit-2.0.png and b/web/www/routino/icons/limit-2.0.png differ
diff --git a/web/www/routino/icons/limit-2.1.png b/web/www/routino/icons/limit-2.1.png
index c222663..7587b6a 100644
Binary files a/web/www/routino/icons/limit-2.1.png and b/web/www/routino/icons/limit-2.1.png differ
diff --git a/web/www/routino/icons/limit-2.2.png b/web/www/routino/icons/limit-2.2.png
index 15a21de..310f51b 100644
Binary files a/web/www/routino/icons/limit-2.2.png and b/web/www/routino/icons/limit-2.2.png differ
diff --git a/web/www/routino/icons/limit-2.3.png b/web/www/routino/icons/limit-2.3.png
index 086b555..854939b 100644
Binary files a/web/www/routino/icons/limit-2.3.png and b/web/www/routino/icons/limit-2.3.png differ
diff --git a/web/www/routino/icons/limit-2.4.png b/web/www/routino/icons/limit-2.4.png
index 050860e..40fbf68 100644
Binary files a/web/www/routino/icons/limit-2.4.png and b/web/www/routino/icons/limit-2.4.png differ
diff --git a/web/www/routino/icons/limit-2.5.png b/web/www/routino/icons/limit-2.5.png
index 3147991..1dc999a 100644
Binary files a/web/www/routino/icons/limit-2.5.png and b/web/www/routino/icons/limit-2.5.png differ
diff --git a/web/www/routino/icons/limit-2.6.png b/web/www/routino/icons/limit-2.6.png
index d40e90e..090810b 100644
Binary files a/web/www/routino/icons/limit-2.6.png and b/web/www/routino/icons/limit-2.6.png differ
diff --git a/web/www/routino/icons/limit-2.7.png b/web/www/routino/icons/limit-2.7.png
index f4b86b5..3920d13 100644
Binary files a/web/www/routino/icons/limit-2.7.png and b/web/www/routino/icons/limit-2.7.png differ
diff --git a/web/www/routino/icons/limit-2.8.png b/web/www/routino/icons/limit-2.8.png
index fc7f1f0..81fba79 100644
Binary files a/web/www/routino/icons/limit-2.8.png and b/web/www/routino/icons/limit-2.8.png differ
diff --git a/web/www/routino/icons/limit-2.9.png b/web/www/routino/icons/limit-2.9.png
index c5bc087..e052eab 100644
Binary files a/web/www/routino/icons/limit-2.9.png and b/web/www/routino/icons/limit-2.9.png differ
diff --git a/web/www/routino/icons/limit-2.png b/web/www/routino/icons/limit-2.png
index 20d99ae..00b0f55 100644
Binary files a/web/www/routino/icons/limit-2.png and b/web/www/routino/icons/limit-2.png differ
diff --git a/web/www/routino/icons/limit-20.0.png b/web/www/routino/icons/limit-20.0.png
index ab85e31..b1e3c9f 100644
Binary files a/web/www/routino/icons/limit-20.0.png and b/web/www/routino/icons/limit-20.0.png differ
diff --git a/web/www/routino/icons/limit-20.1.png b/web/www/routino/icons/limit-20.1.png
index 6ab7a37..f1bf5a2 100644
Binary files a/web/www/routino/icons/limit-20.1.png and b/web/www/routino/icons/limit-20.1.png differ
diff --git a/web/www/routino/icons/limit-20.2.png b/web/www/routino/icons/limit-20.2.png
index a2cf269..471534c 100644
Binary files a/web/www/routino/icons/limit-20.2.png and b/web/www/routino/icons/limit-20.2.png differ
diff --git a/web/www/routino/icons/limit-20.3.png b/web/www/routino/icons/limit-20.3.png
index c552ba5..854c1fb 100644
Binary files a/web/www/routino/icons/limit-20.3.png and b/web/www/routino/icons/limit-20.3.png differ
diff --git a/web/www/routino/icons/limit-20.4.png b/web/www/routino/icons/limit-20.4.png
index e93e084..997857f 100644
Binary files a/web/www/routino/icons/limit-20.4.png and b/web/www/routino/icons/limit-20.4.png differ
diff --git a/web/www/routino/icons/limit-20.5.png b/web/www/routino/icons/limit-20.5.png
index c0ed28f..1923ad9 100644
Binary files a/web/www/routino/icons/limit-20.5.png and b/web/www/routino/icons/limit-20.5.png differ
diff --git a/web/www/routino/icons/limit-20.6.png b/web/www/routino/icons/limit-20.6.png
index 37ee6ca..3aa109d 100644
Binary files a/web/www/routino/icons/limit-20.6.png and b/web/www/routino/icons/limit-20.6.png differ
diff --git a/web/www/routino/icons/limit-20.7.png b/web/www/routino/icons/limit-20.7.png
index e57513e..d798585 100644
Binary files a/web/www/routino/icons/limit-20.7.png and b/web/www/routino/icons/limit-20.7.png differ
diff --git a/web/www/routino/icons/limit-20.8.png b/web/www/routino/icons/limit-20.8.png
index b35a2f6..2a4f9b0 100644
Binary files a/web/www/routino/icons/limit-20.8.png and b/web/www/routino/icons/limit-20.8.png differ
diff --git a/web/www/routino/icons/limit-20.9.png b/web/www/routino/icons/limit-20.9.png
index bf7de7f..859d0c8 100644
Binary files a/web/www/routino/icons/limit-20.9.png and b/web/www/routino/icons/limit-20.9.png differ
diff --git a/web/www/routino/icons/limit-20.png b/web/www/routino/icons/limit-20.png
index 4b8df34..ee7f8c5 100644
Binary files a/web/www/routino/icons/limit-20.png and b/web/www/routino/icons/limit-20.png differ
diff --git a/web/www/routino/icons/limit-200.png b/web/www/routino/icons/limit-200.png
index b5188b1..bcb8e6a 100644
Binary files a/web/www/routino/icons/limit-200.png and b/web/www/routino/icons/limit-200.png differ
diff --git a/web/www/routino/icons/limit-21.0.png b/web/www/routino/icons/limit-21.0.png
index 225c7da..e364f12 100644
Binary files a/web/www/routino/icons/limit-21.0.png and b/web/www/routino/icons/limit-21.0.png differ
diff --git a/web/www/routino/icons/limit-21.1.png b/web/www/routino/icons/limit-21.1.png
index 6c01311..49864bb 100644
Binary files a/web/www/routino/icons/limit-21.1.png and b/web/www/routino/icons/limit-21.1.png differ
diff --git a/web/www/routino/icons/limit-21.2.png b/web/www/routino/icons/limit-21.2.png
index 6542913..a523cd2 100644
Binary files a/web/www/routino/icons/limit-21.2.png and b/web/www/routino/icons/limit-21.2.png differ
diff --git a/web/www/routino/icons/limit-21.3.png b/web/www/routino/icons/limit-21.3.png
index 34ed42f..3672958 100644
Binary files a/web/www/routino/icons/limit-21.3.png and b/web/www/routino/icons/limit-21.3.png differ
diff --git a/web/www/routino/icons/limit-21.4.png b/web/www/routino/icons/limit-21.4.png
index 58288bd..76749cc 100644
Binary files a/web/www/routino/icons/limit-21.4.png and b/web/www/routino/icons/limit-21.4.png differ
diff --git a/web/www/routino/icons/limit-21.5.png b/web/www/routino/icons/limit-21.5.png
index e32b406..7000822 100644
Binary files a/web/www/routino/icons/limit-21.5.png and b/web/www/routino/icons/limit-21.5.png differ
diff --git a/web/www/routino/icons/limit-21.6.png b/web/www/routino/icons/limit-21.6.png
index b1a4b55..fa5e733 100644
Binary files a/web/www/routino/icons/limit-21.6.png and b/web/www/routino/icons/limit-21.6.png differ
diff --git a/web/www/routino/icons/limit-21.7.png b/web/www/routino/icons/limit-21.7.png
index c4bc589..21d5538 100644
Binary files a/web/www/routino/icons/limit-21.7.png and b/web/www/routino/icons/limit-21.7.png differ
diff --git a/web/www/routino/icons/limit-21.8.png b/web/www/routino/icons/limit-21.8.png
index 4b4c33f..dcd5f01 100644
Binary files a/web/www/routino/icons/limit-21.8.png and b/web/www/routino/icons/limit-21.8.png differ
diff --git a/web/www/routino/icons/limit-21.9.png b/web/www/routino/icons/limit-21.9.png
index bd9f445..3583c3d 100644
Binary files a/web/www/routino/icons/limit-21.9.png and b/web/www/routino/icons/limit-21.9.png differ
diff --git a/web/www/routino/icons/limit-21.png b/web/www/routino/icons/limit-21.png
index 80588df..72c5748 100644
Binary files a/web/www/routino/icons/limit-21.png and b/web/www/routino/icons/limit-21.png differ
diff --git a/web/www/routino/icons/limit-22.0.png b/web/www/routino/icons/limit-22.0.png
index e072391..2bbd9c2 100644
Binary files a/web/www/routino/icons/limit-22.0.png and b/web/www/routino/icons/limit-22.0.png differ
diff --git a/web/www/routino/icons/limit-22.1.png b/web/www/routino/icons/limit-22.1.png
index 90e7814..b64244f 100644
Binary files a/web/www/routino/icons/limit-22.1.png and b/web/www/routino/icons/limit-22.1.png differ
diff --git a/web/www/routino/icons/limit-22.2.png b/web/www/routino/icons/limit-22.2.png
index ba7fa5f..9ae259a 100644
Binary files a/web/www/routino/icons/limit-22.2.png and b/web/www/routino/icons/limit-22.2.png differ
diff --git a/web/www/routino/icons/limit-22.3.png b/web/www/routino/icons/limit-22.3.png
index cb66a98..0cf55ae 100644
Binary files a/web/www/routino/icons/limit-22.3.png and b/web/www/routino/icons/limit-22.3.png differ
diff --git a/web/www/routino/icons/limit-22.4.png b/web/www/routino/icons/limit-22.4.png
index 7321125..9c7b9d4 100644
Binary files a/web/www/routino/icons/limit-22.4.png and b/web/www/routino/icons/limit-22.4.png differ
diff --git a/web/www/routino/icons/limit-22.5.png b/web/www/routino/icons/limit-22.5.png
index 6428c22..c6f2775 100644
Binary files a/web/www/routino/icons/limit-22.5.png and b/web/www/routino/icons/limit-22.5.png differ
diff --git a/web/www/routino/icons/limit-22.6.png b/web/www/routino/icons/limit-22.6.png
index ef96e3b..8590fa0 100644
Binary files a/web/www/routino/icons/limit-22.6.png and b/web/www/routino/icons/limit-22.6.png differ
diff --git a/web/www/routino/icons/limit-22.7.png b/web/www/routino/icons/limit-22.7.png
index a092d28..70a9a59 100644
Binary files a/web/www/routino/icons/limit-22.7.png and b/web/www/routino/icons/limit-22.7.png differ
diff --git a/web/www/routino/icons/limit-22.8.png b/web/www/routino/icons/limit-22.8.png
index c387a8c..7ca85fc 100644
Binary files a/web/www/routino/icons/limit-22.8.png and b/web/www/routino/icons/limit-22.8.png differ
diff --git a/web/www/routino/icons/limit-22.9.png b/web/www/routino/icons/limit-22.9.png
index dc275c7..97aed98 100644
Binary files a/web/www/routino/icons/limit-22.9.png and b/web/www/routino/icons/limit-22.9.png differ
diff --git a/web/www/routino/icons/limit-22.png b/web/www/routino/icons/limit-22.png
index f16a8a2..a420af0 100644
Binary files a/web/www/routino/icons/limit-22.png and b/web/www/routino/icons/limit-22.png differ
diff --git a/web/www/routino/icons/limit-23.0.png b/web/www/routino/icons/limit-23.0.png
index ba05f6c..82dbaec 100644
Binary files a/web/www/routino/icons/limit-23.0.png and b/web/www/routino/icons/limit-23.0.png differ
diff --git a/web/www/routino/icons/limit-23.1.png b/web/www/routino/icons/limit-23.1.png
index 30817b2..60c21fd 100644
Binary files a/web/www/routino/icons/limit-23.1.png and b/web/www/routino/icons/limit-23.1.png differ
diff --git a/web/www/routino/icons/limit-23.2.png b/web/www/routino/icons/limit-23.2.png
index 12ec8a4..0728b06 100644
Binary files a/web/www/routino/icons/limit-23.2.png and b/web/www/routino/icons/limit-23.2.png differ
diff --git a/web/www/routino/icons/limit-23.3.png b/web/www/routino/icons/limit-23.3.png
index 378ca34..5c0851f 100644
Binary files a/web/www/routino/icons/limit-23.3.png and b/web/www/routino/icons/limit-23.3.png differ
diff --git a/web/www/routino/icons/limit-23.4.png b/web/www/routino/icons/limit-23.4.png
index 955407a..efa53c9 100644
Binary files a/web/www/routino/icons/limit-23.4.png and b/web/www/routino/icons/limit-23.4.png differ
diff --git a/web/www/routino/icons/limit-23.5.png b/web/www/routino/icons/limit-23.5.png
index fc9bada..085ef28 100644
Binary files a/web/www/routino/icons/limit-23.5.png and b/web/www/routino/icons/limit-23.5.png differ
diff --git a/web/www/routino/icons/limit-23.6.png b/web/www/routino/icons/limit-23.6.png
index c872ec1..0bdb150 100644
Binary files a/web/www/routino/icons/limit-23.6.png and b/web/www/routino/icons/limit-23.6.png differ
diff --git a/web/www/routino/icons/limit-23.7.png b/web/www/routino/icons/limit-23.7.png
index 58b30d9..552ca81 100644
Binary files a/web/www/routino/icons/limit-23.7.png and b/web/www/routino/icons/limit-23.7.png differ
diff --git a/web/www/routino/icons/limit-23.8.png b/web/www/routino/icons/limit-23.8.png
index 71870d4..9349c07 100644
Binary files a/web/www/routino/icons/limit-23.8.png and b/web/www/routino/icons/limit-23.8.png differ
diff --git a/web/www/routino/icons/limit-23.9.png b/web/www/routino/icons/limit-23.9.png
index 32855e7..c270571 100644
Binary files a/web/www/routino/icons/limit-23.9.png and b/web/www/routino/icons/limit-23.9.png differ
diff --git a/web/www/routino/icons/limit-23.png b/web/www/routino/icons/limit-23.png
index 22bebbb..f1c987e 100644
Binary files a/web/www/routino/icons/limit-23.png and b/web/www/routino/icons/limit-23.png differ
diff --git a/web/www/routino/icons/limit-24.0.png b/web/www/routino/icons/limit-24.0.png
index 925bb37..e253173 100644
Binary files a/web/www/routino/icons/limit-24.0.png and b/web/www/routino/icons/limit-24.0.png differ
diff --git a/web/www/routino/icons/limit-24.1.png b/web/www/routino/icons/limit-24.1.png
index 9d77462..e771f5e 100644
Binary files a/web/www/routino/icons/limit-24.1.png and b/web/www/routino/icons/limit-24.1.png differ
diff --git a/web/www/routino/icons/limit-24.2.png b/web/www/routino/icons/limit-24.2.png
index a7c8fe9..327d1d3 100644
Binary files a/web/www/routino/icons/limit-24.2.png and b/web/www/routino/icons/limit-24.2.png differ
diff --git a/web/www/routino/icons/limit-24.3.png b/web/www/routino/icons/limit-24.3.png
index 76c3d2b..09e2de7 100644
Binary files a/web/www/routino/icons/limit-24.3.png and b/web/www/routino/icons/limit-24.3.png differ
diff --git a/web/www/routino/icons/limit-24.4.png b/web/www/routino/icons/limit-24.4.png
index 11cc554..4ca4a29 100644
Binary files a/web/www/routino/icons/limit-24.4.png and b/web/www/routino/icons/limit-24.4.png differ
diff --git a/web/www/routino/icons/limit-24.5.png b/web/www/routino/icons/limit-24.5.png
index f0d3298..d747f18 100644
Binary files a/web/www/routino/icons/limit-24.5.png and b/web/www/routino/icons/limit-24.5.png differ
diff --git a/web/www/routino/icons/limit-24.6.png b/web/www/routino/icons/limit-24.6.png
index 111b207..e0e37d7 100644
Binary files a/web/www/routino/icons/limit-24.6.png and b/web/www/routino/icons/limit-24.6.png differ
diff --git a/web/www/routino/icons/limit-24.7.png b/web/www/routino/icons/limit-24.7.png
index 107853d..1d7dd0e 100644
Binary files a/web/www/routino/icons/limit-24.7.png and b/web/www/routino/icons/limit-24.7.png differ
diff --git a/web/www/routino/icons/limit-24.8.png b/web/www/routino/icons/limit-24.8.png
index 5011e9d..7d5a8ea 100644
Binary files a/web/www/routino/icons/limit-24.8.png and b/web/www/routino/icons/limit-24.8.png differ
diff --git a/web/www/routino/icons/limit-24.9.png b/web/www/routino/icons/limit-24.9.png
index 66a9ce5..4888986 100644
Binary files a/web/www/routino/icons/limit-24.9.png and b/web/www/routino/icons/limit-24.9.png differ
diff --git a/web/www/routino/icons/limit-24.png b/web/www/routino/icons/limit-24.png
index 42bc4d5..6f0fae4 100644
Binary files a/web/www/routino/icons/limit-24.png and b/web/www/routino/icons/limit-24.png differ
diff --git a/web/www/routino/icons/limit-25.0.png b/web/www/routino/icons/limit-25.0.png
index c9a9986..c2b8019 100644
Binary files a/web/www/routino/icons/limit-25.0.png and b/web/www/routino/icons/limit-25.0.png differ
diff --git a/web/www/routino/icons/limit-25.1.png b/web/www/routino/icons/limit-25.1.png
index 76f4eeb..44cf044 100644
Binary files a/web/www/routino/icons/limit-25.1.png and b/web/www/routino/icons/limit-25.1.png differ
diff --git a/web/www/routino/icons/limit-25.2.png b/web/www/routino/icons/limit-25.2.png
index 4f9ca7e..847d3f2 100644
Binary files a/web/www/routino/icons/limit-25.2.png and b/web/www/routino/icons/limit-25.2.png differ
diff --git a/web/www/routino/icons/limit-25.3.png b/web/www/routino/icons/limit-25.3.png
index ec20a25..f610755 100644
Binary files a/web/www/routino/icons/limit-25.3.png and b/web/www/routino/icons/limit-25.3.png differ
diff --git a/web/www/routino/icons/limit-25.4.png b/web/www/routino/icons/limit-25.4.png
index c1e1c55..d84acec 100644
Binary files a/web/www/routino/icons/limit-25.4.png and b/web/www/routino/icons/limit-25.4.png differ
diff --git a/web/www/routino/icons/limit-25.5.png b/web/www/routino/icons/limit-25.5.png
index 98cc7e2..2ddc3cb 100644
Binary files a/web/www/routino/icons/limit-25.5.png and b/web/www/routino/icons/limit-25.5.png differ
diff --git a/web/www/routino/icons/limit-25.6.png b/web/www/routino/icons/limit-25.6.png
index 9ab690d..b5ab1e9 100644
Binary files a/web/www/routino/icons/limit-25.6.png and b/web/www/routino/icons/limit-25.6.png differ
diff --git a/web/www/routino/icons/limit-25.7.png b/web/www/routino/icons/limit-25.7.png
index ddfd247..9c6af87 100644
Binary files a/web/www/routino/icons/limit-25.7.png and b/web/www/routino/icons/limit-25.7.png differ
diff --git a/web/www/routino/icons/limit-25.8.png b/web/www/routino/icons/limit-25.8.png
index cdd9841..5e5a7ba 100644
Binary files a/web/www/routino/icons/limit-25.8.png and b/web/www/routino/icons/limit-25.8.png differ
diff --git a/web/www/routino/icons/limit-25.9.png b/web/www/routino/icons/limit-25.9.png
index 31cd511..421d011 100644
Binary files a/web/www/routino/icons/limit-25.9.png and b/web/www/routino/icons/limit-25.9.png differ
diff --git a/web/www/routino/icons/limit-25.png b/web/www/routino/icons/limit-25.png
index c321da3..1adb49c 100644
Binary files a/web/www/routino/icons/limit-25.png and b/web/www/routino/icons/limit-25.png differ
diff --git a/web/www/routino/icons/limit-26.0.png b/web/www/routino/icons/limit-26.0.png
index 976d9c2..d5a66ff 100644
Binary files a/web/www/routino/icons/limit-26.0.png and b/web/www/routino/icons/limit-26.0.png differ
diff --git a/web/www/routino/icons/limit-26.1.png b/web/www/routino/icons/limit-26.1.png
index dcc082c..264c863 100644
Binary files a/web/www/routino/icons/limit-26.1.png and b/web/www/routino/icons/limit-26.1.png differ
diff --git a/web/www/routino/icons/limit-26.2.png b/web/www/routino/icons/limit-26.2.png
index 5dae133..c39fe93 100644
Binary files a/web/www/routino/icons/limit-26.2.png and b/web/www/routino/icons/limit-26.2.png differ
diff --git a/web/www/routino/icons/limit-26.3.png b/web/www/routino/icons/limit-26.3.png
index c22f3f5..fdcac60 100644
Binary files a/web/www/routino/icons/limit-26.3.png and b/web/www/routino/icons/limit-26.3.png differ
diff --git a/web/www/routino/icons/limit-26.4.png b/web/www/routino/icons/limit-26.4.png
index cad0d2d..ea5b325 100644
Binary files a/web/www/routino/icons/limit-26.4.png and b/web/www/routino/icons/limit-26.4.png differ
diff --git a/web/www/routino/icons/limit-26.5.png b/web/www/routino/icons/limit-26.5.png
index ea5a533..c665dee 100644
Binary files a/web/www/routino/icons/limit-26.5.png and b/web/www/routino/icons/limit-26.5.png differ
diff --git a/web/www/routino/icons/limit-26.6.png b/web/www/routino/icons/limit-26.6.png
index 9847fde..637538c 100644
Binary files a/web/www/routino/icons/limit-26.6.png and b/web/www/routino/icons/limit-26.6.png differ
diff --git a/web/www/routino/icons/limit-26.7.png b/web/www/routino/icons/limit-26.7.png
index a93cfa0..77e7324 100644
Binary files a/web/www/routino/icons/limit-26.7.png and b/web/www/routino/icons/limit-26.7.png differ
diff --git a/web/www/routino/icons/limit-26.8.png b/web/www/routino/icons/limit-26.8.png
index 9e5e38c..6d17805 100644
Binary files a/web/www/routino/icons/limit-26.8.png and b/web/www/routino/icons/limit-26.8.png differ
diff --git a/web/www/routino/icons/limit-26.9.png b/web/www/routino/icons/limit-26.9.png
index 43b2b48..37720ef 100644
Binary files a/web/www/routino/icons/limit-26.9.png and b/web/www/routino/icons/limit-26.9.png differ
diff --git a/web/www/routino/icons/limit-26.png b/web/www/routino/icons/limit-26.png
index 6379016..78921d4 100644
Binary files a/web/www/routino/icons/limit-26.png and b/web/www/routino/icons/limit-26.png differ
diff --git a/web/www/routino/icons/limit-27.0.png b/web/www/routino/icons/limit-27.0.png
index e8e325a..cb07e28 100644
Binary files a/web/www/routino/icons/limit-27.0.png and b/web/www/routino/icons/limit-27.0.png differ
diff --git a/web/www/routino/icons/limit-27.1.png b/web/www/routino/icons/limit-27.1.png
index f85be71..ac13c7c 100644
Binary files a/web/www/routino/icons/limit-27.1.png and b/web/www/routino/icons/limit-27.1.png differ
diff --git a/web/www/routino/icons/limit-27.2.png b/web/www/routino/icons/limit-27.2.png
index 6b20bf4..f5e4895 100644
Binary files a/web/www/routino/icons/limit-27.2.png and b/web/www/routino/icons/limit-27.2.png differ
diff --git a/web/www/routino/icons/limit-27.3.png b/web/www/routino/icons/limit-27.3.png
index 4617e45..13c76b0 100644
Binary files a/web/www/routino/icons/limit-27.3.png and b/web/www/routino/icons/limit-27.3.png differ
diff --git a/web/www/routino/icons/limit-27.4.png b/web/www/routino/icons/limit-27.4.png
index 4d1e1ee..b2c0aed 100644
Binary files a/web/www/routino/icons/limit-27.4.png and b/web/www/routino/icons/limit-27.4.png differ
diff --git a/web/www/routino/icons/limit-27.5.png b/web/www/routino/icons/limit-27.5.png
index e1dc528..9cca54b 100644
Binary files a/web/www/routino/icons/limit-27.5.png and b/web/www/routino/icons/limit-27.5.png differ
diff --git a/web/www/routino/icons/limit-27.6.png b/web/www/routino/icons/limit-27.6.png
index 259a475..26c2987 100644
Binary files a/web/www/routino/icons/limit-27.6.png and b/web/www/routino/icons/limit-27.6.png differ
diff --git a/web/www/routino/icons/limit-27.7.png b/web/www/routino/icons/limit-27.7.png
index ed9cb2e..0d53ad5 100644
Binary files a/web/www/routino/icons/limit-27.7.png and b/web/www/routino/icons/limit-27.7.png differ
diff --git a/web/www/routino/icons/limit-27.8.png b/web/www/routino/icons/limit-27.8.png
index bb11f11..779d95d 100644
Binary files a/web/www/routino/icons/limit-27.8.png and b/web/www/routino/icons/limit-27.8.png differ
diff --git a/web/www/routino/icons/limit-27.9.png b/web/www/routino/icons/limit-27.9.png
index 7bbda2b..d7fad28 100644
Binary files a/web/www/routino/icons/limit-27.9.png and b/web/www/routino/icons/limit-27.9.png differ
diff --git a/web/www/routino/icons/limit-27.png b/web/www/routino/icons/limit-27.png
index 58442d8..b9390c3 100644
Binary files a/web/www/routino/icons/limit-27.png and b/web/www/routino/icons/limit-27.png differ
diff --git a/web/www/routino/icons/limit-28.0.png b/web/www/routino/icons/limit-28.0.png
index dc4aa67..72beb18 100644
Binary files a/web/www/routino/icons/limit-28.0.png and b/web/www/routino/icons/limit-28.0.png differ
diff --git a/web/www/routino/icons/limit-28.1.png b/web/www/routino/icons/limit-28.1.png
index 2428ddd..ddbc5ea 100644
Binary files a/web/www/routino/icons/limit-28.1.png and b/web/www/routino/icons/limit-28.1.png differ
diff --git a/web/www/routino/icons/limit-28.2.png b/web/www/routino/icons/limit-28.2.png
index 936db5b..301a520 100644
Binary files a/web/www/routino/icons/limit-28.2.png and b/web/www/routino/icons/limit-28.2.png differ
diff --git a/web/www/routino/icons/limit-28.3.png b/web/www/routino/icons/limit-28.3.png
index 19cd113..69cf3b3 100644
Binary files a/web/www/routino/icons/limit-28.3.png and b/web/www/routino/icons/limit-28.3.png differ
diff --git a/web/www/routino/icons/limit-28.4.png b/web/www/routino/icons/limit-28.4.png
index 707cafc..739f578 100644
Binary files a/web/www/routino/icons/limit-28.4.png and b/web/www/routino/icons/limit-28.4.png differ
diff --git a/web/www/routino/icons/limit-28.5.png b/web/www/routino/icons/limit-28.5.png
index 9402c28..f6ebaf2 100644
Binary files a/web/www/routino/icons/limit-28.5.png and b/web/www/routino/icons/limit-28.5.png differ
diff --git a/web/www/routino/icons/limit-28.6.png b/web/www/routino/icons/limit-28.6.png
index 283027c..76e3a45 100644
Binary files a/web/www/routino/icons/limit-28.6.png and b/web/www/routino/icons/limit-28.6.png differ
diff --git a/web/www/routino/icons/limit-28.7.png b/web/www/routino/icons/limit-28.7.png
index 8dff14c..64b7079 100644
Binary files a/web/www/routino/icons/limit-28.7.png and b/web/www/routino/icons/limit-28.7.png differ
diff --git a/web/www/routino/icons/limit-28.8.png b/web/www/routino/icons/limit-28.8.png
index c64e756..d1f3dd7 100644
Binary files a/web/www/routino/icons/limit-28.8.png and b/web/www/routino/icons/limit-28.8.png differ
diff --git a/web/www/routino/icons/limit-28.9.png b/web/www/routino/icons/limit-28.9.png
index 73213f7..d89ebd0 100644
Binary files a/web/www/routino/icons/limit-28.9.png and b/web/www/routino/icons/limit-28.9.png differ
diff --git a/web/www/routino/icons/limit-28.png b/web/www/routino/icons/limit-28.png
index 4e1e36e..6e10301 100644
Binary files a/web/www/routino/icons/limit-28.png and b/web/www/routino/icons/limit-28.png differ
diff --git a/web/www/routino/icons/limit-29.0.png b/web/www/routino/icons/limit-29.0.png
index 4ed2443..ea8826b 100644
Binary files a/web/www/routino/icons/limit-29.0.png and b/web/www/routino/icons/limit-29.0.png differ
diff --git a/web/www/routino/icons/limit-29.1.png b/web/www/routino/icons/limit-29.1.png
index f3e6547..05c389b 100644
Binary files a/web/www/routino/icons/limit-29.1.png and b/web/www/routino/icons/limit-29.1.png differ
diff --git a/web/www/routino/icons/limit-29.2.png b/web/www/routino/icons/limit-29.2.png
index 7e16966..a35602f 100644
Binary files a/web/www/routino/icons/limit-29.2.png and b/web/www/routino/icons/limit-29.2.png differ
diff --git a/web/www/routino/icons/limit-29.3.png b/web/www/routino/icons/limit-29.3.png
index ef5728f..e7c240b 100644
Binary files a/web/www/routino/icons/limit-29.3.png and b/web/www/routino/icons/limit-29.3.png differ
diff --git a/web/www/routino/icons/limit-29.4.png b/web/www/routino/icons/limit-29.4.png
index fdc5380..daf0e0a 100644
Binary files a/web/www/routino/icons/limit-29.4.png and b/web/www/routino/icons/limit-29.4.png differ
diff --git a/web/www/routino/icons/limit-29.5.png b/web/www/routino/icons/limit-29.5.png
index a322054..01dd611 100644
Binary files a/web/www/routino/icons/limit-29.5.png and b/web/www/routino/icons/limit-29.5.png differ
diff --git a/web/www/routino/icons/limit-29.6.png b/web/www/routino/icons/limit-29.6.png
index 4e9bb34..4ead8e4 100644
Binary files a/web/www/routino/icons/limit-29.6.png and b/web/www/routino/icons/limit-29.6.png differ
diff --git a/web/www/routino/icons/limit-29.7.png b/web/www/routino/icons/limit-29.7.png
index a6e5c9c..afd2276 100644
Binary files a/web/www/routino/icons/limit-29.7.png and b/web/www/routino/icons/limit-29.7.png differ
diff --git a/web/www/routino/icons/limit-29.8.png b/web/www/routino/icons/limit-29.8.png
index 6fe17ff..0b25940 100644
Binary files a/web/www/routino/icons/limit-29.8.png and b/web/www/routino/icons/limit-29.8.png differ
diff --git a/web/www/routino/icons/limit-29.9.png b/web/www/routino/icons/limit-29.9.png
index d006b6b..a75bd6f 100644
Binary files a/web/www/routino/icons/limit-29.9.png and b/web/www/routino/icons/limit-29.9.png differ
diff --git a/web/www/routino/icons/limit-29.png b/web/www/routino/icons/limit-29.png
index 6c5c8c7..3105838 100644
Binary files a/web/www/routino/icons/limit-29.png and b/web/www/routino/icons/limit-29.png differ
diff --git a/web/www/routino/icons/limit-3.0.png b/web/www/routino/icons/limit-3.0.png
index cbf63cd..2d37a47 100644
Binary files a/web/www/routino/icons/limit-3.0.png and b/web/www/routino/icons/limit-3.0.png differ
diff --git a/web/www/routino/icons/limit-3.1.png b/web/www/routino/icons/limit-3.1.png
index 2d19477..505e87a 100644
Binary files a/web/www/routino/icons/limit-3.1.png and b/web/www/routino/icons/limit-3.1.png differ
diff --git a/web/www/routino/icons/limit-3.2.png b/web/www/routino/icons/limit-3.2.png
index 8c1cd22..96bd415 100644
Binary files a/web/www/routino/icons/limit-3.2.png and b/web/www/routino/icons/limit-3.2.png differ
diff --git a/web/www/routino/icons/limit-3.3.png b/web/www/routino/icons/limit-3.3.png
index c1a1cb8..0cda330 100644
Binary files a/web/www/routino/icons/limit-3.3.png and b/web/www/routino/icons/limit-3.3.png differ
diff --git a/web/www/routino/icons/limit-3.4.png b/web/www/routino/icons/limit-3.4.png
index e277112..6cd46cd 100644
Binary files a/web/www/routino/icons/limit-3.4.png and b/web/www/routino/icons/limit-3.4.png differ
diff --git a/web/www/routino/icons/limit-3.5.png b/web/www/routino/icons/limit-3.5.png
index 7274b1d..aae3c9a 100644
Binary files a/web/www/routino/icons/limit-3.5.png and b/web/www/routino/icons/limit-3.5.png differ
diff --git a/web/www/routino/icons/limit-3.6.png b/web/www/routino/icons/limit-3.6.png
index 1cd6058..7ee0b80 100644
Binary files a/web/www/routino/icons/limit-3.6.png and b/web/www/routino/icons/limit-3.6.png differ
diff --git a/web/www/routino/icons/limit-3.7.png b/web/www/routino/icons/limit-3.7.png
index a9959f7..4a6a58b 100644
Binary files a/web/www/routino/icons/limit-3.7.png and b/web/www/routino/icons/limit-3.7.png differ
diff --git a/web/www/routino/icons/limit-3.8.png b/web/www/routino/icons/limit-3.8.png
index b3964d6..32d42b4 100644
Binary files a/web/www/routino/icons/limit-3.8.png and b/web/www/routino/icons/limit-3.8.png differ
diff --git a/web/www/routino/icons/limit-3.9.png b/web/www/routino/icons/limit-3.9.png
index cfab4b8..20128dc 100644
Binary files a/web/www/routino/icons/limit-3.9.png and b/web/www/routino/icons/limit-3.9.png differ
diff --git a/web/www/routino/icons/limit-3.png b/web/www/routino/icons/limit-3.png
index c1255eb..5e7515a 100644
Binary files a/web/www/routino/icons/limit-3.png and b/web/www/routino/icons/limit-3.png differ
diff --git a/web/www/routino/icons/limit-30.0.png b/web/www/routino/icons/limit-30.0.png
index 32f8c94..7c85fdc 100644
Binary files a/web/www/routino/icons/limit-30.0.png and b/web/www/routino/icons/limit-30.0.png differ
diff --git a/web/www/routino/icons/limit-30.1.png b/web/www/routino/icons/limit-30.1.png
index 246f634..d757578 100644
Binary files a/web/www/routino/icons/limit-30.1.png and b/web/www/routino/icons/limit-30.1.png differ
diff --git a/web/www/routino/icons/limit-30.2.png b/web/www/routino/icons/limit-30.2.png
index 981ca49..1c9693d 100644
Binary files a/web/www/routino/icons/limit-30.2.png and b/web/www/routino/icons/limit-30.2.png differ
diff --git a/web/www/routino/icons/limit-30.3.png b/web/www/routino/icons/limit-30.3.png
index 1175149..464b3d8 100644
Binary files a/web/www/routino/icons/limit-30.3.png and b/web/www/routino/icons/limit-30.3.png differ
diff --git a/web/www/routino/icons/limit-30.4.png b/web/www/routino/icons/limit-30.4.png
index d56d440..83f3498 100644
Binary files a/web/www/routino/icons/limit-30.4.png and b/web/www/routino/icons/limit-30.4.png differ
diff --git a/web/www/routino/icons/limit-30.5.png b/web/www/routino/icons/limit-30.5.png
index 2d95f2a..63bf310 100644
Binary files a/web/www/routino/icons/limit-30.5.png and b/web/www/routino/icons/limit-30.5.png differ
diff --git a/web/www/routino/icons/limit-30.6.png b/web/www/routino/icons/limit-30.6.png
index b7ef30e..daeb82f 100644
Binary files a/web/www/routino/icons/limit-30.6.png and b/web/www/routino/icons/limit-30.6.png differ
diff --git a/web/www/routino/icons/limit-30.7.png b/web/www/routino/icons/limit-30.7.png
index 9a2d235..b8b45f8 100644
Binary files a/web/www/routino/icons/limit-30.7.png and b/web/www/routino/icons/limit-30.7.png differ
diff --git a/web/www/routino/icons/limit-30.8.png b/web/www/routino/icons/limit-30.8.png
index ddc5583..169d7db 100644
Binary files a/web/www/routino/icons/limit-30.8.png and b/web/www/routino/icons/limit-30.8.png differ
diff --git a/web/www/routino/icons/limit-30.9.png b/web/www/routino/icons/limit-30.9.png
index 778aa31..687064b 100644
Binary files a/web/www/routino/icons/limit-30.9.png and b/web/www/routino/icons/limit-30.9.png differ
diff --git a/web/www/routino/icons/limit-30.png b/web/www/routino/icons/limit-30.png
index 17eb1fa..a144150 100644
Binary files a/web/www/routino/icons/limit-30.png and b/web/www/routino/icons/limit-30.png differ
diff --git a/web/www/routino/icons/limit-31.0.png b/web/www/routino/icons/limit-31.0.png
index f6e4889..0f7e8c1 100644
Binary files a/web/www/routino/icons/limit-31.0.png and b/web/www/routino/icons/limit-31.0.png differ
diff --git a/web/www/routino/icons/limit-31.1.png b/web/www/routino/icons/limit-31.1.png
index 3058fbb..c1e1ef4 100644
Binary files a/web/www/routino/icons/limit-31.1.png and b/web/www/routino/icons/limit-31.1.png differ
diff --git a/web/www/routino/icons/limit-31.2.png b/web/www/routino/icons/limit-31.2.png
index fe9d24e..090751e 100644
Binary files a/web/www/routino/icons/limit-31.2.png and b/web/www/routino/icons/limit-31.2.png differ
diff --git a/web/www/routino/icons/limit-31.3.png b/web/www/routino/icons/limit-31.3.png
index 6c3ebdb..c1bf91d 100644
Binary files a/web/www/routino/icons/limit-31.3.png and b/web/www/routino/icons/limit-31.3.png differ
diff --git a/web/www/routino/icons/limit-31.4.png b/web/www/routino/icons/limit-31.4.png
index 99e34f6..d29f33d 100644
Binary files a/web/www/routino/icons/limit-31.4.png and b/web/www/routino/icons/limit-31.4.png differ
diff --git a/web/www/routino/icons/limit-31.5.png b/web/www/routino/icons/limit-31.5.png
index 5c98dd7..5494ede 100644
Binary files a/web/www/routino/icons/limit-31.5.png and b/web/www/routino/icons/limit-31.5.png differ
diff --git a/web/www/routino/icons/limit-31.6.png b/web/www/routino/icons/limit-31.6.png
index da4467a..6e4aa04 100644
Binary files a/web/www/routino/icons/limit-31.6.png and b/web/www/routino/icons/limit-31.6.png differ
diff --git a/web/www/routino/icons/limit-31.7.png b/web/www/routino/icons/limit-31.7.png
index 62052a5..e7dcd3e 100644
Binary files a/web/www/routino/icons/limit-31.7.png and b/web/www/routino/icons/limit-31.7.png differ
diff --git a/web/www/routino/icons/limit-31.8.png b/web/www/routino/icons/limit-31.8.png
index e9e5f9d..6c35281 100644
Binary files a/web/www/routino/icons/limit-31.8.png and b/web/www/routino/icons/limit-31.8.png differ
diff --git a/web/www/routino/icons/limit-31.9.png b/web/www/routino/icons/limit-31.9.png
index 12a479a..cb6cbbe 100644
Binary files a/web/www/routino/icons/limit-31.9.png and b/web/www/routino/icons/limit-31.9.png differ
diff --git a/web/www/routino/icons/limit-31.png b/web/www/routino/icons/limit-31.png
index a13b170..6834572 100644
Binary files a/web/www/routino/icons/limit-31.png and b/web/www/routino/icons/limit-31.png differ
diff --git a/web/www/routino/icons/limit-32.0.png b/web/www/routino/icons/limit-32.0.png
index f70abdb..43426b8 100644
Binary files a/web/www/routino/icons/limit-32.0.png and b/web/www/routino/icons/limit-32.0.png differ
diff --git a/web/www/routino/icons/limit-32.1.png b/web/www/routino/icons/limit-32.1.png
index 8f8ac42..22829e0 100644
Binary files a/web/www/routino/icons/limit-32.1.png and b/web/www/routino/icons/limit-32.1.png differ
diff --git a/web/www/routino/icons/limit-32.2.png b/web/www/routino/icons/limit-32.2.png
index 08592c2..d563721 100644
Binary files a/web/www/routino/icons/limit-32.2.png and b/web/www/routino/icons/limit-32.2.png differ
diff --git a/web/www/routino/icons/limit-32.3.png b/web/www/routino/icons/limit-32.3.png
index 44b2c41..819dc94 100644
Binary files a/web/www/routino/icons/limit-32.3.png and b/web/www/routino/icons/limit-32.3.png differ
diff --git a/web/www/routino/icons/limit-32.4.png b/web/www/routino/icons/limit-32.4.png
index f261a29..0bbe703 100644
Binary files a/web/www/routino/icons/limit-32.4.png and b/web/www/routino/icons/limit-32.4.png differ
diff --git a/web/www/routino/icons/limit-32.5.png b/web/www/routino/icons/limit-32.5.png
index 25e88e1..183a776 100644
Binary files a/web/www/routino/icons/limit-32.5.png and b/web/www/routino/icons/limit-32.5.png differ
diff --git a/web/www/routino/icons/limit-32.6.png b/web/www/routino/icons/limit-32.6.png
index 7bee498..93115e4 100644
Binary files a/web/www/routino/icons/limit-32.6.png and b/web/www/routino/icons/limit-32.6.png differ
diff --git a/web/www/routino/icons/limit-32.7.png b/web/www/routino/icons/limit-32.7.png
index c58ecad..e416b86 100644
Binary files a/web/www/routino/icons/limit-32.7.png and b/web/www/routino/icons/limit-32.7.png differ
diff --git a/web/www/routino/icons/limit-32.8.png b/web/www/routino/icons/limit-32.8.png
index e423ee6..784ac8e 100644
Binary files a/web/www/routino/icons/limit-32.8.png and b/web/www/routino/icons/limit-32.8.png differ
diff --git a/web/www/routino/icons/limit-32.9.png b/web/www/routino/icons/limit-32.9.png
index 8284195..523e9d7 100644
Binary files a/web/www/routino/icons/limit-32.9.png and b/web/www/routino/icons/limit-32.9.png differ
diff --git a/web/www/routino/icons/limit-32.png b/web/www/routino/icons/limit-32.png
index 86aa8a5..ab58ec5 100644
Binary files a/web/www/routino/icons/limit-32.png and b/web/www/routino/icons/limit-32.png differ
diff --git a/web/www/routino/icons/limit-33.0.png b/web/www/routino/icons/limit-33.0.png
index d93284a..d57178d 100644
Binary files a/web/www/routino/icons/limit-33.0.png and b/web/www/routino/icons/limit-33.0.png differ
diff --git a/web/www/routino/icons/limit-33.1.png b/web/www/routino/icons/limit-33.1.png
index fd48495..7e504ca 100644
Binary files a/web/www/routino/icons/limit-33.1.png and b/web/www/routino/icons/limit-33.1.png differ
diff --git a/web/www/routino/icons/limit-33.2.png b/web/www/routino/icons/limit-33.2.png
index 605ae42..2701516 100644
Binary files a/web/www/routino/icons/limit-33.2.png and b/web/www/routino/icons/limit-33.2.png differ
diff --git a/web/www/routino/icons/limit-33.3.png b/web/www/routino/icons/limit-33.3.png
index c72d912..c539b16 100644
Binary files a/web/www/routino/icons/limit-33.3.png and b/web/www/routino/icons/limit-33.3.png differ
diff --git a/web/www/routino/icons/limit-33.4.png b/web/www/routino/icons/limit-33.4.png
index 05194ec..92da486 100644
Binary files a/web/www/routino/icons/limit-33.4.png and b/web/www/routino/icons/limit-33.4.png differ
diff --git a/web/www/routino/icons/limit-33.5.png b/web/www/routino/icons/limit-33.5.png
index 0278d16..9c84150 100644
Binary files a/web/www/routino/icons/limit-33.5.png and b/web/www/routino/icons/limit-33.5.png differ
diff --git a/web/www/routino/icons/limit-33.6.png b/web/www/routino/icons/limit-33.6.png
index 427a680..93ed3e7 100644
Binary files a/web/www/routino/icons/limit-33.6.png and b/web/www/routino/icons/limit-33.6.png differ
diff --git a/web/www/routino/icons/limit-33.7.png b/web/www/routino/icons/limit-33.7.png
index d856a51..fdc57b7 100644
Binary files a/web/www/routino/icons/limit-33.7.png and b/web/www/routino/icons/limit-33.7.png differ
diff --git a/web/www/routino/icons/limit-33.8.png b/web/www/routino/icons/limit-33.8.png
index b2469f1..7f3d952 100644
Binary files a/web/www/routino/icons/limit-33.8.png and b/web/www/routino/icons/limit-33.8.png differ
diff --git a/web/www/routino/icons/limit-33.9.png b/web/www/routino/icons/limit-33.9.png
index d439bde..acced9a 100644
Binary files a/web/www/routino/icons/limit-33.9.png and b/web/www/routino/icons/limit-33.9.png differ
diff --git a/web/www/routino/icons/limit-33.png b/web/www/routino/icons/limit-33.png
index 911366c..409807f 100644
Binary files a/web/www/routino/icons/limit-33.png and b/web/www/routino/icons/limit-33.png differ
diff --git a/web/www/routino/icons/limit-34.0.png b/web/www/routino/icons/limit-34.0.png
index 9e1a1dc..ba3c992 100644
Binary files a/web/www/routino/icons/limit-34.0.png and b/web/www/routino/icons/limit-34.0.png differ
diff --git a/web/www/routino/icons/limit-34.1.png b/web/www/routino/icons/limit-34.1.png
index 128c07c..d349aab 100644
Binary files a/web/www/routino/icons/limit-34.1.png and b/web/www/routino/icons/limit-34.1.png differ
diff --git a/web/www/routino/icons/limit-34.2.png b/web/www/routino/icons/limit-34.2.png
index af82d82..8bd3b96 100644
Binary files a/web/www/routino/icons/limit-34.2.png and b/web/www/routino/icons/limit-34.2.png differ
diff --git a/web/www/routino/icons/limit-34.3.png b/web/www/routino/icons/limit-34.3.png
index b846ab4..58d35f6 100644
Binary files a/web/www/routino/icons/limit-34.3.png and b/web/www/routino/icons/limit-34.3.png differ
diff --git a/web/www/routino/icons/limit-34.4.png b/web/www/routino/icons/limit-34.4.png
index eee9472..a0890e1 100644
Binary files a/web/www/routino/icons/limit-34.4.png and b/web/www/routino/icons/limit-34.4.png differ
diff --git a/web/www/routino/icons/limit-34.5.png b/web/www/routino/icons/limit-34.5.png
index 3616677..4826ff9 100644
Binary files a/web/www/routino/icons/limit-34.5.png and b/web/www/routino/icons/limit-34.5.png differ
diff --git a/web/www/routino/icons/limit-34.6.png b/web/www/routino/icons/limit-34.6.png
index 6abfb7d..7b56fdb 100644
Binary files a/web/www/routino/icons/limit-34.6.png and b/web/www/routino/icons/limit-34.6.png differ
diff --git a/web/www/routino/icons/limit-34.7.png b/web/www/routino/icons/limit-34.7.png
index 74c8969..65df693 100644
Binary files a/web/www/routino/icons/limit-34.7.png and b/web/www/routino/icons/limit-34.7.png differ
diff --git a/web/www/routino/icons/limit-34.8.png b/web/www/routino/icons/limit-34.8.png
index f70496c..8590a8b 100644
Binary files a/web/www/routino/icons/limit-34.8.png and b/web/www/routino/icons/limit-34.8.png differ
diff --git a/web/www/routino/icons/limit-34.9.png b/web/www/routino/icons/limit-34.9.png
index 74cae15..ac01e9f 100644
Binary files a/web/www/routino/icons/limit-34.9.png and b/web/www/routino/icons/limit-34.9.png differ
diff --git a/web/www/routino/icons/limit-34.png b/web/www/routino/icons/limit-34.png
index de88dab..32001be 100644
Binary files a/web/www/routino/icons/limit-34.png and b/web/www/routino/icons/limit-34.png differ
diff --git a/web/www/routino/icons/limit-35.0.png b/web/www/routino/icons/limit-35.0.png
index 4e39eb4..4adcb79 100644
Binary files a/web/www/routino/icons/limit-35.0.png and b/web/www/routino/icons/limit-35.0.png differ
diff --git a/web/www/routino/icons/limit-35.1.png b/web/www/routino/icons/limit-35.1.png
index f9e565b..09cecce 100644
Binary files a/web/www/routino/icons/limit-35.1.png and b/web/www/routino/icons/limit-35.1.png differ
diff --git a/web/www/routino/icons/limit-35.2.png b/web/www/routino/icons/limit-35.2.png
index fdb8a43..fabedd0 100644
Binary files a/web/www/routino/icons/limit-35.2.png and b/web/www/routino/icons/limit-35.2.png differ
diff --git a/web/www/routino/icons/limit-35.3.png b/web/www/routino/icons/limit-35.3.png
index 8d51517..6f05e1e 100644
Binary files a/web/www/routino/icons/limit-35.3.png and b/web/www/routino/icons/limit-35.3.png differ
diff --git a/web/www/routino/icons/limit-35.4.png b/web/www/routino/icons/limit-35.4.png
index ae8b83b..0657056 100644
Binary files a/web/www/routino/icons/limit-35.4.png and b/web/www/routino/icons/limit-35.4.png differ
diff --git a/web/www/routino/icons/limit-35.5.png b/web/www/routino/icons/limit-35.5.png
index 42da75c..c731d5c 100644
Binary files a/web/www/routino/icons/limit-35.5.png and b/web/www/routino/icons/limit-35.5.png differ
diff --git a/web/www/routino/icons/limit-35.6.png b/web/www/routino/icons/limit-35.6.png
index c1f5ef6..f5c17e6 100644
Binary files a/web/www/routino/icons/limit-35.6.png and b/web/www/routino/icons/limit-35.6.png differ
diff --git a/web/www/routino/icons/limit-35.7.png b/web/www/routino/icons/limit-35.7.png
index 36efab8..2c6a2eb 100644
Binary files a/web/www/routino/icons/limit-35.7.png and b/web/www/routino/icons/limit-35.7.png differ
diff --git a/web/www/routino/icons/limit-35.8.png b/web/www/routino/icons/limit-35.8.png
index 8cc4f1a..2b2a0ad 100644
Binary files a/web/www/routino/icons/limit-35.8.png and b/web/www/routino/icons/limit-35.8.png differ
diff --git a/web/www/routino/icons/limit-35.9.png b/web/www/routino/icons/limit-35.9.png
index 477ebf7..ede4894 100644
Binary files a/web/www/routino/icons/limit-35.9.png and b/web/www/routino/icons/limit-35.9.png differ
diff --git a/web/www/routino/icons/limit-35.png b/web/www/routino/icons/limit-35.png
index 8e0f960..41e9c0a 100644
Binary files a/web/www/routino/icons/limit-35.png and b/web/www/routino/icons/limit-35.png differ
diff --git a/web/www/routino/icons/limit-36.0.png b/web/www/routino/icons/limit-36.0.png
index 159e6b9..e832429 100644
Binary files a/web/www/routino/icons/limit-36.0.png and b/web/www/routino/icons/limit-36.0.png differ
diff --git a/web/www/routino/icons/limit-36.1.png b/web/www/routino/icons/limit-36.1.png
index 3b8924b..9c2e5fb 100644
Binary files a/web/www/routino/icons/limit-36.1.png and b/web/www/routino/icons/limit-36.1.png differ
diff --git a/web/www/routino/icons/limit-36.2.png b/web/www/routino/icons/limit-36.2.png
index 30b311f..8267a0e 100644
Binary files a/web/www/routino/icons/limit-36.2.png and b/web/www/routino/icons/limit-36.2.png differ
diff --git a/web/www/routino/icons/limit-36.3.png b/web/www/routino/icons/limit-36.3.png
index 9656264..197c5c9 100644
Binary files a/web/www/routino/icons/limit-36.3.png and b/web/www/routino/icons/limit-36.3.png differ
diff --git a/web/www/routino/icons/limit-36.4.png b/web/www/routino/icons/limit-36.4.png
index af65483..6613bff 100644
Binary files a/web/www/routino/icons/limit-36.4.png and b/web/www/routino/icons/limit-36.4.png differ
diff --git a/web/www/routino/icons/limit-36.5.png b/web/www/routino/icons/limit-36.5.png
index 0ee669f..4f5a156 100644
Binary files a/web/www/routino/icons/limit-36.5.png and b/web/www/routino/icons/limit-36.5.png differ
diff --git a/web/www/routino/icons/limit-36.6.png b/web/www/routino/icons/limit-36.6.png
index e3cb96c..049765a 100644
Binary files a/web/www/routino/icons/limit-36.6.png and b/web/www/routino/icons/limit-36.6.png differ
diff --git a/web/www/routino/icons/limit-36.7.png b/web/www/routino/icons/limit-36.7.png
index 56971f4..e809a50 100644
Binary files a/web/www/routino/icons/limit-36.7.png and b/web/www/routino/icons/limit-36.7.png differ
diff --git a/web/www/routino/icons/limit-36.8.png b/web/www/routino/icons/limit-36.8.png
index e11243c..82a503c 100644
Binary files a/web/www/routino/icons/limit-36.8.png and b/web/www/routino/icons/limit-36.8.png differ
diff --git a/web/www/routino/icons/limit-36.9.png b/web/www/routino/icons/limit-36.9.png
index f9fde38..38d9921 100644
Binary files a/web/www/routino/icons/limit-36.9.png and b/web/www/routino/icons/limit-36.9.png differ
diff --git a/web/www/routino/icons/limit-36.png b/web/www/routino/icons/limit-36.png
index ebb4f15..ef6e7dc 100644
Binary files a/web/www/routino/icons/limit-36.png and b/web/www/routino/icons/limit-36.png differ
diff --git a/web/www/routino/icons/limit-37.0.png b/web/www/routino/icons/limit-37.0.png
index 398160a..9f035d9 100644
Binary files a/web/www/routino/icons/limit-37.0.png and b/web/www/routino/icons/limit-37.0.png differ
diff --git a/web/www/routino/icons/limit-37.1.png b/web/www/routino/icons/limit-37.1.png
index 5c50116..4303286 100644
Binary files a/web/www/routino/icons/limit-37.1.png and b/web/www/routino/icons/limit-37.1.png differ
diff --git a/web/www/routino/icons/limit-37.2.png b/web/www/routino/icons/limit-37.2.png
index 921ec23..38ee84b 100644
Binary files a/web/www/routino/icons/limit-37.2.png and b/web/www/routino/icons/limit-37.2.png differ
diff --git a/web/www/routino/icons/limit-37.3.png b/web/www/routino/icons/limit-37.3.png
index 31e23fd..09d37ee 100644
Binary files a/web/www/routino/icons/limit-37.3.png and b/web/www/routino/icons/limit-37.3.png differ
diff --git a/web/www/routino/icons/limit-37.4.png b/web/www/routino/icons/limit-37.4.png
index a8b7d22..e35b42a 100644
Binary files a/web/www/routino/icons/limit-37.4.png and b/web/www/routino/icons/limit-37.4.png differ
diff --git a/web/www/routino/icons/limit-37.5.png b/web/www/routino/icons/limit-37.5.png
index 8a3e364..77d54df 100644
Binary files a/web/www/routino/icons/limit-37.5.png and b/web/www/routino/icons/limit-37.5.png differ
diff --git a/web/www/routino/icons/limit-37.6.png b/web/www/routino/icons/limit-37.6.png
index 81f3427..c819ceb 100644
Binary files a/web/www/routino/icons/limit-37.6.png and b/web/www/routino/icons/limit-37.6.png differ
diff --git a/web/www/routino/icons/limit-37.7.png b/web/www/routino/icons/limit-37.7.png
index b5373a1..bd09114 100644
Binary files a/web/www/routino/icons/limit-37.7.png and b/web/www/routino/icons/limit-37.7.png differ
diff --git a/web/www/routino/icons/limit-37.8.png b/web/www/routino/icons/limit-37.8.png
index 45e6112..3fd2ad6 100644
Binary files a/web/www/routino/icons/limit-37.8.png and b/web/www/routino/icons/limit-37.8.png differ
diff --git a/web/www/routino/icons/limit-37.9.png b/web/www/routino/icons/limit-37.9.png
index 01003e0..e192276 100644
Binary files a/web/www/routino/icons/limit-37.9.png and b/web/www/routino/icons/limit-37.9.png differ
diff --git a/web/www/routino/icons/limit-37.png b/web/www/routino/icons/limit-37.png
index 25f67e9..d25f3ff 100644
Binary files a/web/www/routino/icons/limit-37.png and b/web/www/routino/icons/limit-37.png differ
diff --git a/web/www/routino/icons/limit-38.0.png b/web/www/routino/icons/limit-38.0.png
index 9c29d07..f4d8c28 100644
Binary files a/web/www/routino/icons/limit-38.0.png and b/web/www/routino/icons/limit-38.0.png differ
diff --git a/web/www/routino/icons/limit-38.1.png b/web/www/routino/icons/limit-38.1.png
index 049ca97..830fcd8 100644
Binary files a/web/www/routino/icons/limit-38.1.png and b/web/www/routino/icons/limit-38.1.png differ
diff --git a/web/www/routino/icons/limit-38.2.png b/web/www/routino/icons/limit-38.2.png
index cb723e3..2ed72fb 100644
Binary files a/web/www/routino/icons/limit-38.2.png and b/web/www/routino/icons/limit-38.2.png differ
diff --git a/web/www/routino/icons/limit-38.3.png b/web/www/routino/icons/limit-38.3.png
index 839198c..9bb9909 100644
Binary files a/web/www/routino/icons/limit-38.3.png and b/web/www/routino/icons/limit-38.3.png differ
diff --git a/web/www/routino/icons/limit-38.4.png b/web/www/routino/icons/limit-38.4.png
index 6eec8df..efb534c 100644
Binary files a/web/www/routino/icons/limit-38.4.png and b/web/www/routino/icons/limit-38.4.png differ
diff --git a/web/www/routino/icons/limit-38.5.png b/web/www/routino/icons/limit-38.5.png
index 27b3a03..5bb04f7 100644
Binary files a/web/www/routino/icons/limit-38.5.png and b/web/www/routino/icons/limit-38.5.png differ
diff --git a/web/www/routino/icons/limit-38.6.png b/web/www/routino/icons/limit-38.6.png
index c0c19bc..beb4daf 100644
Binary files a/web/www/routino/icons/limit-38.6.png and b/web/www/routino/icons/limit-38.6.png differ
diff --git a/web/www/routino/icons/limit-38.7.png b/web/www/routino/icons/limit-38.7.png
index ce26c8b..681da4b 100644
Binary files a/web/www/routino/icons/limit-38.7.png and b/web/www/routino/icons/limit-38.7.png differ
diff --git a/web/www/routino/icons/limit-38.8.png b/web/www/routino/icons/limit-38.8.png
index 835f8d3..0d4bb25 100644
Binary files a/web/www/routino/icons/limit-38.8.png and b/web/www/routino/icons/limit-38.8.png differ
diff --git a/web/www/routino/icons/limit-38.9.png b/web/www/routino/icons/limit-38.9.png
index b1299f7..2d46266 100644
Binary files a/web/www/routino/icons/limit-38.9.png and b/web/www/routino/icons/limit-38.9.png differ
diff --git a/web/www/routino/icons/limit-38.png b/web/www/routino/icons/limit-38.png
index bceea90..a8f29b9 100644
Binary files a/web/www/routino/icons/limit-38.png and b/web/www/routino/icons/limit-38.png differ
diff --git a/web/www/routino/icons/limit-39.0.png b/web/www/routino/icons/limit-39.0.png
index 2f9536e..7cb74fe 100644
Binary files a/web/www/routino/icons/limit-39.0.png and b/web/www/routino/icons/limit-39.0.png differ
diff --git a/web/www/routino/icons/limit-39.1.png b/web/www/routino/icons/limit-39.1.png
index 14cbeb2..6c061fe 100644
Binary files a/web/www/routino/icons/limit-39.1.png and b/web/www/routino/icons/limit-39.1.png differ
diff --git a/web/www/routino/icons/limit-39.2.png b/web/www/routino/icons/limit-39.2.png
index d592d41..fa27e50 100644
Binary files a/web/www/routino/icons/limit-39.2.png and b/web/www/routino/icons/limit-39.2.png differ
diff --git a/web/www/routino/icons/limit-39.3.png b/web/www/routino/icons/limit-39.3.png
index eab05ca..7743456 100644
Binary files a/web/www/routino/icons/limit-39.3.png and b/web/www/routino/icons/limit-39.3.png differ
diff --git a/web/www/routino/icons/limit-39.4.png b/web/www/routino/icons/limit-39.4.png
index c774139..bf70a1b 100644
Binary files a/web/www/routino/icons/limit-39.4.png and b/web/www/routino/icons/limit-39.4.png differ
diff --git a/web/www/routino/icons/limit-39.5.png b/web/www/routino/icons/limit-39.5.png
index 3e3080e..c073860 100644
Binary files a/web/www/routino/icons/limit-39.5.png and b/web/www/routino/icons/limit-39.5.png differ
diff --git a/web/www/routino/icons/limit-39.6.png b/web/www/routino/icons/limit-39.6.png
index 1ed8a59..0752b79 100644
Binary files a/web/www/routino/icons/limit-39.6.png and b/web/www/routino/icons/limit-39.6.png differ
diff --git a/web/www/routino/icons/limit-39.7.png b/web/www/routino/icons/limit-39.7.png
index f59d3ab..c7c9334 100644
Binary files a/web/www/routino/icons/limit-39.7.png and b/web/www/routino/icons/limit-39.7.png differ
diff --git a/web/www/routino/icons/limit-39.8.png b/web/www/routino/icons/limit-39.8.png
index 3e36950..1c09fa3 100644
Binary files a/web/www/routino/icons/limit-39.8.png and b/web/www/routino/icons/limit-39.8.png differ
diff --git a/web/www/routino/icons/limit-39.9.png b/web/www/routino/icons/limit-39.9.png
index 5f5bba8..9c1ca46 100644
Binary files a/web/www/routino/icons/limit-39.9.png and b/web/www/routino/icons/limit-39.9.png differ
diff --git a/web/www/routino/icons/limit-39.png b/web/www/routino/icons/limit-39.png
index ab87b0f..9555f93 100644
Binary files a/web/www/routino/icons/limit-39.png and b/web/www/routino/icons/limit-39.png differ
diff --git a/web/www/routino/icons/limit-4.0.png b/web/www/routino/icons/limit-4.0.png
index 048fcbb..1f14fa0 100644
Binary files a/web/www/routino/icons/limit-4.0.png and b/web/www/routino/icons/limit-4.0.png differ
diff --git a/web/www/routino/icons/limit-4.1.png b/web/www/routino/icons/limit-4.1.png
index 579d123..54fc33a 100644
Binary files a/web/www/routino/icons/limit-4.1.png and b/web/www/routino/icons/limit-4.1.png differ
diff --git a/web/www/routino/icons/limit-4.2.png b/web/www/routino/icons/limit-4.2.png
index f83b13c..99965c1 100644
Binary files a/web/www/routino/icons/limit-4.2.png and b/web/www/routino/icons/limit-4.2.png differ
diff --git a/web/www/routino/icons/limit-4.3.png b/web/www/routino/icons/limit-4.3.png
index 01ed9e8..560e17b 100644
Binary files a/web/www/routino/icons/limit-4.3.png and b/web/www/routino/icons/limit-4.3.png differ
diff --git a/web/www/routino/icons/limit-4.4.png b/web/www/routino/icons/limit-4.4.png
index 78faaee..9b645a2 100644
Binary files a/web/www/routino/icons/limit-4.4.png and b/web/www/routino/icons/limit-4.4.png differ
diff --git a/web/www/routino/icons/limit-4.5.png b/web/www/routino/icons/limit-4.5.png
index 1784923..68d9984 100644
Binary files a/web/www/routino/icons/limit-4.5.png and b/web/www/routino/icons/limit-4.5.png differ
diff --git a/web/www/routino/icons/limit-4.6.png b/web/www/routino/icons/limit-4.6.png
index c609871..1369b4b 100644
Binary files a/web/www/routino/icons/limit-4.6.png and b/web/www/routino/icons/limit-4.6.png differ
diff --git a/web/www/routino/icons/limit-4.7.png b/web/www/routino/icons/limit-4.7.png
index e532b3f..bea7cec 100644
Binary files a/web/www/routino/icons/limit-4.7.png and b/web/www/routino/icons/limit-4.7.png differ
diff --git a/web/www/routino/icons/limit-4.8.png b/web/www/routino/icons/limit-4.8.png
index bef607b..30c7ba9 100644
Binary files a/web/www/routino/icons/limit-4.8.png and b/web/www/routino/icons/limit-4.8.png differ
diff --git a/web/www/routino/icons/limit-4.9.png b/web/www/routino/icons/limit-4.9.png
index 1db7cfb..c9e629f 100644
Binary files a/web/www/routino/icons/limit-4.9.png and b/web/www/routino/icons/limit-4.9.png differ
diff --git a/web/www/routino/icons/limit-4.png b/web/www/routino/icons/limit-4.png
index 2fe80fc..c77cda1 100644
Binary files a/web/www/routino/icons/limit-4.png and b/web/www/routino/icons/limit-4.png differ
diff --git a/web/www/routino/icons/limit-40.0.png b/web/www/routino/icons/limit-40.0.png
index e28f18c..915ddfd 100644
Binary files a/web/www/routino/icons/limit-40.0.png and b/web/www/routino/icons/limit-40.0.png differ
diff --git a/web/www/routino/icons/limit-40.png b/web/www/routino/icons/limit-40.png
index 83c025c..04222a7 100644
Binary files a/web/www/routino/icons/limit-40.png and b/web/www/routino/icons/limit-40.png differ
diff --git a/web/www/routino/icons/limit-41.png b/web/www/routino/icons/limit-41.png
index 6e95a95..a4075eb 100644
Binary files a/web/www/routino/icons/limit-41.png and b/web/www/routino/icons/limit-41.png differ
diff --git a/web/www/routino/icons/limit-42.png b/web/www/routino/icons/limit-42.png
index 05d5c0c..8e070df 100644
Binary files a/web/www/routino/icons/limit-42.png and b/web/www/routino/icons/limit-42.png differ
diff --git a/web/www/routino/icons/limit-43.png b/web/www/routino/icons/limit-43.png
index 2673ee0..4e2bcc7 100644
Binary files a/web/www/routino/icons/limit-43.png and b/web/www/routino/icons/limit-43.png differ
diff --git a/web/www/routino/icons/limit-44.png b/web/www/routino/icons/limit-44.png
index f647b79..4532994 100644
Binary files a/web/www/routino/icons/limit-44.png and b/web/www/routino/icons/limit-44.png differ
diff --git a/web/www/routino/icons/limit-45.png b/web/www/routino/icons/limit-45.png
index 64c903f..3c7096b 100644
Binary files a/web/www/routino/icons/limit-45.png and b/web/www/routino/icons/limit-45.png differ
diff --git a/web/www/routino/icons/limit-46.png b/web/www/routino/icons/limit-46.png
index 9cffc37..300b849 100644
Binary files a/web/www/routino/icons/limit-46.png and b/web/www/routino/icons/limit-46.png differ
diff --git a/web/www/routino/icons/limit-47.png b/web/www/routino/icons/limit-47.png
index 8b2d98e..87a9c3a 100644
Binary files a/web/www/routino/icons/limit-47.png and b/web/www/routino/icons/limit-47.png differ
diff --git a/web/www/routino/icons/limit-48.png b/web/www/routino/icons/limit-48.png
index 5b9a54c..3cd2a3a 100644
Binary files a/web/www/routino/icons/limit-48.png and b/web/www/routino/icons/limit-48.png differ
diff --git a/web/www/routino/icons/limit-49.png b/web/www/routino/icons/limit-49.png
index 41626c7..a151066 100644
Binary files a/web/www/routino/icons/limit-49.png and b/web/www/routino/icons/limit-49.png differ
diff --git a/web/www/routino/icons/limit-5.0.png b/web/www/routino/icons/limit-5.0.png
index 19ab9fc..721f602 100644
Binary files a/web/www/routino/icons/limit-5.0.png and b/web/www/routino/icons/limit-5.0.png differ
diff --git a/web/www/routino/icons/limit-5.1.png b/web/www/routino/icons/limit-5.1.png
index ccf2000..e8793a0 100644
Binary files a/web/www/routino/icons/limit-5.1.png and b/web/www/routino/icons/limit-5.1.png differ
diff --git a/web/www/routino/icons/limit-5.2.png b/web/www/routino/icons/limit-5.2.png
index 16c9a92..a3e30cd 100644
Binary files a/web/www/routino/icons/limit-5.2.png and b/web/www/routino/icons/limit-5.2.png differ
diff --git a/web/www/routino/icons/limit-5.3.png b/web/www/routino/icons/limit-5.3.png
index 1c938a5..8249dbe 100644
Binary files a/web/www/routino/icons/limit-5.3.png and b/web/www/routino/icons/limit-5.3.png differ
diff --git a/web/www/routino/icons/limit-5.4.png b/web/www/routino/icons/limit-5.4.png
index 6bd2dd9..31ea2ae 100644
Binary files a/web/www/routino/icons/limit-5.4.png and b/web/www/routino/icons/limit-5.4.png differ
diff --git a/web/www/routino/icons/limit-5.5.png b/web/www/routino/icons/limit-5.5.png
index 14137cd..c9c68ca 100644
Binary files a/web/www/routino/icons/limit-5.5.png and b/web/www/routino/icons/limit-5.5.png differ
diff --git a/web/www/routino/icons/limit-5.6.png b/web/www/routino/icons/limit-5.6.png
index bf37818..dbb9adc 100644
Binary files a/web/www/routino/icons/limit-5.6.png and b/web/www/routino/icons/limit-5.6.png differ
diff --git a/web/www/routino/icons/limit-5.7.png b/web/www/routino/icons/limit-5.7.png
index 3bdcefd..6c0d4c4 100644
Binary files a/web/www/routino/icons/limit-5.7.png and b/web/www/routino/icons/limit-5.7.png differ
diff --git a/web/www/routino/icons/limit-5.8.png b/web/www/routino/icons/limit-5.8.png
index b46d5ea..898f9bd 100644
Binary files a/web/www/routino/icons/limit-5.8.png and b/web/www/routino/icons/limit-5.8.png differ
diff --git a/web/www/routino/icons/limit-5.9.png b/web/www/routino/icons/limit-5.9.png
index 6e0d3af..a23512c 100644
Binary files a/web/www/routino/icons/limit-5.9.png and b/web/www/routino/icons/limit-5.9.png differ
diff --git a/web/www/routino/icons/limit-5.png b/web/www/routino/icons/limit-5.png
index fa16682..c04e306 100644
Binary files a/web/www/routino/icons/limit-5.png and b/web/www/routino/icons/limit-5.png differ
diff --git a/web/www/routino/icons/limit-50.png b/web/www/routino/icons/limit-50.png
index 87045e0..98ce536 100644
Binary files a/web/www/routino/icons/limit-50.png and b/web/www/routino/icons/limit-50.png differ
diff --git a/web/www/routino/icons/limit-51.png b/web/www/routino/icons/limit-51.png
index bf5f490..10be5df 100644
Binary files a/web/www/routino/icons/limit-51.png and b/web/www/routino/icons/limit-51.png differ
diff --git a/web/www/routino/icons/limit-52.png b/web/www/routino/icons/limit-52.png
index e84bfed..a9d6c67 100644
Binary files a/web/www/routino/icons/limit-52.png and b/web/www/routino/icons/limit-52.png differ
diff --git a/web/www/routino/icons/limit-53.png b/web/www/routino/icons/limit-53.png
index d2056fc..2a7e6e7 100644
Binary files a/web/www/routino/icons/limit-53.png and b/web/www/routino/icons/limit-53.png differ
diff --git a/web/www/routino/icons/limit-54.png b/web/www/routino/icons/limit-54.png
index 4f20141..b6d62d8 100644
Binary files a/web/www/routino/icons/limit-54.png and b/web/www/routino/icons/limit-54.png differ
diff --git a/web/www/routino/icons/limit-55.png b/web/www/routino/icons/limit-55.png
index 590fc7d..1a930fd 100644
Binary files a/web/www/routino/icons/limit-55.png and b/web/www/routino/icons/limit-55.png differ
diff --git a/web/www/routino/icons/limit-56.png b/web/www/routino/icons/limit-56.png
index 5f89177..98ae308 100644
Binary files a/web/www/routino/icons/limit-56.png and b/web/www/routino/icons/limit-56.png differ
diff --git a/web/www/routino/icons/limit-57.png b/web/www/routino/icons/limit-57.png
index 80a30a4..240b1d0 100644
Binary files a/web/www/routino/icons/limit-57.png and b/web/www/routino/icons/limit-57.png differ
diff --git a/web/www/routino/icons/limit-58.png b/web/www/routino/icons/limit-58.png
index 849b52e..53b3044 100644
Binary files a/web/www/routino/icons/limit-58.png and b/web/www/routino/icons/limit-58.png differ
diff --git a/web/www/routino/icons/limit-59.png b/web/www/routino/icons/limit-59.png
index d7ed354..a0844af 100644
Binary files a/web/www/routino/icons/limit-59.png and b/web/www/routino/icons/limit-59.png differ
diff --git a/web/www/routino/icons/limit-6.0.png b/web/www/routino/icons/limit-6.0.png
index b50f6d1..3fd2fb2 100644
Binary files a/web/www/routino/icons/limit-6.0.png and b/web/www/routino/icons/limit-6.0.png differ
diff --git a/web/www/routino/icons/limit-6.1.png b/web/www/routino/icons/limit-6.1.png
index a2cb41e..1c3b022 100644
Binary files a/web/www/routino/icons/limit-6.1.png and b/web/www/routino/icons/limit-6.1.png differ
diff --git a/web/www/routino/icons/limit-6.2.png b/web/www/routino/icons/limit-6.2.png
index 62b63d9..ffc3ce5 100644
Binary files a/web/www/routino/icons/limit-6.2.png and b/web/www/routino/icons/limit-6.2.png differ
diff --git a/web/www/routino/icons/limit-6.3.png b/web/www/routino/icons/limit-6.3.png
index ab847fb..e01d62c 100644
Binary files a/web/www/routino/icons/limit-6.3.png and b/web/www/routino/icons/limit-6.3.png differ
diff --git a/web/www/routino/icons/limit-6.4.png b/web/www/routino/icons/limit-6.4.png
index 91bf7e9..3310052 100644
Binary files a/web/www/routino/icons/limit-6.4.png and b/web/www/routino/icons/limit-6.4.png differ
diff --git a/web/www/routino/icons/limit-6.5.png b/web/www/routino/icons/limit-6.5.png
index 5219b48..7e66986 100644
Binary files a/web/www/routino/icons/limit-6.5.png and b/web/www/routino/icons/limit-6.5.png differ
diff --git a/web/www/routino/icons/limit-6.6.png b/web/www/routino/icons/limit-6.6.png
index a2eb350..fb9c6fe 100644
Binary files a/web/www/routino/icons/limit-6.6.png and b/web/www/routino/icons/limit-6.6.png differ
diff --git a/web/www/routino/icons/limit-6.7.png b/web/www/routino/icons/limit-6.7.png
index 9f85ede..1a69ef7 100644
Binary files a/web/www/routino/icons/limit-6.7.png and b/web/www/routino/icons/limit-6.7.png differ
diff --git a/web/www/routino/icons/limit-6.8.png b/web/www/routino/icons/limit-6.8.png
index 2fadb2e..9141209 100644
Binary files a/web/www/routino/icons/limit-6.8.png and b/web/www/routino/icons/limit-6.8.png differ
diff --git a/web/www/routino/icons/limit-6.9.png b/web/www/routino/icons/limit-6.9.png
index c9a8668..3343ede 100644
Binary files a/web/www/routino/icons/limit-6.9.png and b/web/www/routino/icons/limit-6.9.png differ
diff --git a/web/www/routino/icons/limit-6.png b/web/www/routino/icons/limit-6.png
index 4a68452..631c1b8 100644
Binary files a/web/www/routino/icons/limit-6.png and b/web/www/routino/icons/limit-6.png differ
diff --git a/web/www/routino/icons/limit-60.png b/web/www/routino/icons/limit-60.png
index df35f10..652d46b 100644
Binary files a/web/www/routino/icons/limit-60.png and b/web/www/routino/icons/limit-60.png differ
diff --git a/web/www/routino/icons/limit-61.png b/web/www/routino/icons/limit-61.png
index c3fbb69..f4a3998 100644
Binary files a/web/www/routino/icons/limit-61.png and b/web/www/routino/icons/limit-61.png differ
diff --git a/web/www/routino/icons/limit-62.png b/web/www/routino/icons/limit-62.png
index cb82c58..316906f 100644
Binary files a/web/www/routino/icons/limit-62.png and b/web/www/routino/icons/limit-62.png differ
diff --git a/web/www/routino/icons/limit-63.png b/web/www/routino/icons/limit-63.png
index 3fadfa1..9892f3d 100644
Binary files a/web/www/routino/icons/limit-63.png and b/web/www/routino/icons/limit-63.png differ
diff --git a/web/www/routino/icons/limit-64.png b/web/www/routino/icons/limit-64.png
index d9f01f3..cf00240 100644
Binary files a/web/www/routino/icons/limit-64.png and b/web/www/routino/icons/limit-64.png differ
diff --git a/web/www/routino/icons/limit-65.png b/web/www/routino/icons/limit-65.png
index d8ebe64..c482b3d 100644
Binary files a/web/www/routino/icons/limit-65.png and b/web/www/routino/icons/limit-65.png differ
diff --git a/web/www/routino/icons/limit-66.png b/web/www/routino/icons/limit-66.png
index b6e198e..1c1b016 100644
Binary files a/web/www/routino/icons/limit-66.png and b/web/www/routino/icons/limit-66.png differ
diff --git a/web/www/routino/icons/limit-67.png b/web/www/routino/icons/limit-67.png
index 773e430..3288984 100644
Binary files a/web/www/routino/icons/limit-67.png and b/web/www/routino/icons/limit-67.png differ
diff --git a/web/www/routino/icons/limit-68.png b/web/www/routino/icons/limit-68.png
index 16273f1..b6637e4 100644
Binary files a/web/www/routino/icons/limit-68.png and b/web/www/routino/icons/limit-68.png differ
diff --git a/web/www/routino/icons/limit-69.png b/web/www/routino/icons/limit-69.png
index aa334a2..4ace76b 100644
Binary files a/web/www/routino/icons/limit-69.png and b/web/www/routino/icons/limit-69.png differ
diff --git a/web/www/routino/icons/limit-7.0.png b/web/www/routino/icons/limit-7.0.png
index f6a4b69..71d2b45 100644
Binary files a/web/www/routino/icons/limit-7.0.png and b/web/www/routino/icons/limit-7.0.png differ
diff --git a/web/www/routino/icons/limit-7.1.png b/web/www/routino/icons/limit-7.1.png
index e9f4e0f..70e4d25 100644
Binary files a/web/www/routino/icons/limit-7.1.png and b/web/www/routino/icons/limit-7.1.png differ
diff --git a/web/www/routino/icons/limit-7.2.png b/web/www/routino/icons/limit-7.2.png
index 6ee8cec..a77d7ff 100644
Binary files a/web/www/routino/icons/limit-7.2.png and b/web/www/routino/icons/limit-7.2.png differ
diff --git a/web/www/routino/icons/limit-7.3.png b/web/www/routino/icons/limit-7.3.png
index a389d89..045d1ff 100644
Binary files a/web/www/routino/icons/limit-7.3.png and b/web/www/routino/icons/limit-7.3.png differ
diff --git a/web/www/routino/icons/limit-7.4.png b/web/www/routino/icons/limit-7.4.png
index c766875..7aa1688 100644
Binary files a/web/www/routino/icons/limit-7.4.png and b/web/www/routino/icons/limit-7.4.png differ
diff --git a/web/www/routino/icons/limit-7.5.png b/web/www/routino/icons/limit-7.5.png
index c758901..bad2ac5 100644
Binary files a/web/www/routino/icons/limit-7.5.png and b/web/www/routino/icons/limit-7.5.png differ
diff --git a/web/www/routino/icons/limit-7.6.png b/web/www/routino/icons/limit-7.6.png
index 893bd9f..c9c9233 100644
Binary files a/web/www/routino/icons/limit-7.6.png and b/web/www/routino/icons/limit-7.6.png differ
diff --git a/web/www/routino/icons/limit-7.7.png b/web/www/routino/icons/limit-7.7.png
index 2ea25e6..628c6d3 100644
Binary files a/web/www/routino/icons/limit-7.7.png and b/web/www/routino/icons/limit-7.7.png differ
diff --git a/web/www/routino/icons/limit-7.8.png b/web/www/routino/icons/limit-7.8.png
index a730f15..c8af3f9 100644
Binary files a/web/www/routino/icons/limit-7.8.png and b/web/www/routino/icons/limit-7.8.png differ
diff --git a/web/www/routino/icons/limit-7.9.png b/web/www/routino/icons/limit-7.9.png
index 3f31419..3b44e57 100644
Binary files a/web/www/routino/icons/limit-7.9.png and b/web/www/routino/icons/limit-7.9.png differ
diff --git a/web/www/routino/icons/limit-7.png b/web/www/routino/icons/limit-7.png
index 7eb8208..7d2ec53 100644
Binary files a/web/www/routino/icons/limit-7.png and b/web/www/routino/icons/limit-7.png differ
diff --git a/web/www/routino/icons/limit-70.png b/web/www/routino/icons/limit-70.png
index 74442c6..adfe4bf 100644
Binary files a/web/www/routino/icons/limit-70.png and b/web/www/routino/icons/limit-70.png differ
diff --git a/web/www/routino/icons/limit-71.png b/web/www/routino/icons/limit-71.png
index ca32a66..6cf37c2 100644
Binary files a/web/www/routino/icons/limit-71.png and b/web/www/routino/icons/limit-71.png differ
diff --git a/web/www/routino/icons/limit-72.png b/web/www/routino/icons/limit-72.png
index 096367c..ca0e304 100644
Binary files a/web/www/routino/icons/limit-72.png and b/web/www/routino/icons/limit-72.png differ
diff --git a/web/www/routino/icons/limit-73.png b/web/www/routino/icons/limit-73.png
index 44b0179..99d4b9b 100644
Binary files a/web/www/routino/icons/limit-73.png and b/web/www/routino/icons/limit-73.png differ
diff --git a/web/www/routino/icons/limit-74.png b/web/www/routino/icons/limit-74.png
index 78db7d8..4bb2ffe 100644
Binary files a/web/www/routino/icons/limit-74.png and b/web/www/routino/icons/limit-74.png differ
diff --git a/web/www/routino/icons/limit-75.png b/web/www/routino/icons/limit-75.png
index fbb78cd..c18c51f 100644
Binary files a/web/www/routino/icons/limit-75.png and b/web/www/routino/icons/limit-75.png differ
diff --git a/web/www/routino/icons/limit-76.png b/web/www/routino/icons/limit-76.png
index a53365f..181b9e6 100644
Binary files a/web/www/routino/icons/limit-76.png and b/web/www/routino/icons/limit-76.png differ
diff --git a/web/www/routino/icons/limit-77.png b/web/www/routino/icons/limit-77.png
index 78ee2c3..4645a1d 100644
Binary files a/web/www/routino/icons/limit-77.png and b/web/www/routino/icons/limit-77.png differ
diff --git a/web/www/routino/icons/limit-78.png b/web/www/routino/icons/limit-78.png
index 23cbf85..ee63fb3 100644
Binary files a/web/www/routino/icons/limit-78.png and b/web/www/routino/icons/limit-78.png differ
diff --git a/web/www/routino/icons/limit-79.png b/web/www/routino/icons/limit-79.png
index 5c471e4..faf8f95 100644
Binary files a/web/www/routino/icons/limit-79.png and b/web/www/routino/icons/limit-79.png differ
diff --git a/web/www/routino/icons/limit-8.0.png b/web/www/routino/icons/limit-8.0.png
index eab7ca3..049e49b 100644
Binary files a/web/www/routino/icons/limit-8.0.png and b/web/www/routino/icons/limit-8.0.png differ
diff --git a/web/www/routino/icons/limit-8.1.png b/web/www/routino/icons/limit-8.1.png
index 0e67f1a..03d8cc5 100644
Binary files a/web/www/routino/icons/limit-8.1.png and b/web/www/routino/icons/limit-8.1.png differ
diff --git a/web/www/routino/icons/limit-8.2.png b/web/www/routino/icons/limit-8.2.png
index e53bdf6..5429f81 100644
Binary files a/web/www/routino/icons/limit-8.2.png and b/web/www/routino/icons/limit-8.2.png differ
diff --git a/web/www/routino/icons/limit-8.3.png b/web/www/routino/icons/limit-8.3.png
index c886bba..d540b68 100644
Binary files a/web/www/routino/icons/limit-8.3.png and b/web/www/routino/icons/limit-8.3.png differ
diff --git a/web/www/routino/icons/limit-8.4.png b/web/www/routino/icons/limit-8.4.png
index 231405e..db27f7c 100644
Binary files a/web/www/routino/icons/limit-8.4.png and b/web/www/routino/icons/limit-8.4.png differ
diff --git a/web/www/routino/icons/limit-8.5.png b/web/www/routino/icons/limit-8.5.png
index 77718d6..202429b 100644
Binary files a/web/www/routino/icons/limit-8.5.png and b/web/www/routino/icons/limit-8.5.png differ
diff --git a/web/www/routino/icons/limit-8.6.png b/web/www/routino/icons/limit-8.6.png
index b39aa61..f8e9e51 100644
Binary files a/web/www/routino/icons/limit-8.6.png and b/web/www/routino/icons/limit-8.6.png differ
diff --git a/web/www/routino/icons/limit-8.7.png b/web/www/routino/icons/limit-8.7.png
index 1ba485c..dacd97c 100644
Binary files a/web/www/routino/icons/limit-8.7.png and b/web/www/routino/icons/limit-8.7.png differ
diff --git a/web/www/routino/icons/limit-8.8.png b/web/www/routino/icons/limit-8.8.png
index 90422df..efa4e56 100644
Binary files a/web/www/routino/icons/limit-8.8.png and b/web/www/routino/icons/limit-8.8.png differ
diff --git a/web/www/routino/icons/limit-8.9.png b/web/www/routino/icons/limit-8.9.png
index 11e3e70..2139092 100644
Binary files a/web/www/routino/icons/limit-8.9.png and b/web/www/routino/icons/limit-8.9.png differ
diff --git a/web/www/routino/icons/limit-8.png b/web/www/routino/icons/limit-8.png
index 4e21699..828ee11 100644
Binary files a/web/www/routino/icons/limit-8.png and b/web/www/routino/icons/limit-8.png differ
diff --git a/web/www/routino/icons/limit-80.png b/web/www/routino/icons/limit-80.png
index 687ac18..57d2923 100644
Binary files a/web/www/routino/icons/limit-80.png and b/web/www/routino/icons/limit-80.png differ
diff --git a/web/www/routino/icons/limit-81.png b/web/www/routino/icons/limit-81.png
index dc4a385..7eb6693 100644
Binary files a/web/www/routino/icons/limit-81.png and b/web/www/routino/icons/limit-81.png differ
diff --git a/web/www/routino/icons/limit-82.png b/web/www/routino/icons/limit-82.png
index 7403cac..2401a3f 100644
Binary files a/web/www/routino/icons/limit-82.png and b/web/www/routino/icons/limit-82.png differ
diff --git a/web/www/routino/icons/limit-83.png b/web/www/routino/icons/limit-83.png
index f83c07c..ad50551 100644
Binary files a/web/www/routino/icons/limit-83.png and b/web/www/routino/icons/limit-83.png differ
diff --git a/web/www/routino/icons/limit-84.png b/web/www/routino/icons/limit-84.png
index 4e7ad7b..35e263a 100644
Binary files a/web/www/routino/icons/limit-84.png and b/web/www/routino/icons/limit-84.png differ
diff --git a/web/www/routino/icons/limit-85.png b/web/www/routino/icons/limit-85.png
index 83537f3..f05f949 100644
Binary files a/web/www/routino/icons/limit-85.png and b/web/www/routino/icons/limit-85.png differ
diff --git a/web/www/routino/icons/limit-86.png b/web/www/routino/icons/limit-86.png
index 73cc252..74e18c5 100644
Binary files a/web/www/routino/icons/limit-86.png and b/web/www/routino/icons/limit-86.png differ
diff --git a/web/www/routino/icons/limit-87.png b/web/www/routino/icons/limit-87.png
index 986bf0e..caea485 100644
Binary files a/web/www/routino/icons/limit-87.png and b/web/www/routino/icons/limit-87.png differ
diff --git a/web/www/routino/icons/limit-88.png b/web/www/routino/icons/limit-88.png
index 661f482..b842de8 100644
Binary files a/web/www/routino/icons/limit-88.png and b/web/www/routino/icons/limit-88.png differ
diff --git a/web/www/routino/icons/limit-89.png b/web/www/routino/icons/limit-89.png
index ba61519..df584d5 100644
Binary files a/web/www/routino/icons/limit-89.png and b/web/www/routino/icons/limit-89.png differ
diff --git a/web/www/routino/icons/limit-9.0.png b/web/www/routino/icons/limit-9.0.png
index b246776..c23f8b4 100644
Binary files a/web/www/routino/icons/limit-9.0.png and b/web/www/routino/icons/limit-9.0.png differ
diff --git a/web/www/routino/icons/limit-9.1.png b/web/www/routino/icons/limit-9.1.png
index 59c221c..a825a8a 100644
Binary files a/web/www/routino/icons/limit-9.1.png and b/web/www/routino/icons/limit-9.1.png differ
diff --git a/web/www/routino/icons/limit-9.2.png b/web/www/routino/icons/limit-9.2.png
index 78b081a..70ba967 100644
Binary files a/web/www/routino/icons/limit-9.2.png and b/web/www/routino/icons/limit-9.2.png differ
diff --git a/web/www/routino/icons/limit-9.3.png b/web/www/routino/icons/limit-9.3.png
index e3a256b..a0f598a 100644
Binary files a/web/www/routino/icons/limit-9.3.png and b/web/www/routino/icons/limit-9.3.png differ
diff --git a/web/www/routino/icons/limit-9.4.png b/web/www/routino/icons/limit-9.4.png
index 93865e5..e8d7004 100644
Binary files a/web/www/routino/icons/limit-9.4.png and b/web/www/routino/icons/limit-9.4.png differ
diff --git a/web/www/routino/icons/limit-9.5.png b/web/www/routino/icons/limit-9.5.png
index ae6c56f..8bbb26a 100644
Binary files a/web/www/routino/icons/limit-9.5.png and b/web/www/routino/icons/limit-9.5.png differ
diff --git a/web/www/routino/icons/limit-9.6.png b/web/www/routino/icons/limit-9.6.png
index 831a8c6..602066c 100644
Binary files a/web/www/routino/icons/limit-9.6.png and b/web/www/routino/icons/limit-9.6.png differ
diff --git a/web/www/routino/icons/limit-9.7.png b/web/www/routino/icons/limit-9.7.png
index cb547b5..7bc0fbc 100644
Binary files a/web/www/routino/icons/limit-9.7.png and b/web/www/routino/icons/limit-9.7.png differ
diff --git a/web/www/routino/icons/limit-9.8.png b/web/www/routino/icons/limit-9.8.png
index b13aeae..4cd606e 100644
Binary files a/web/www/routino/icons/limit-9.8.png and b/web/www/routino/icons/limit-9.8.png differ
diff --git a/web/www/routino/icons/limit-9.9.png b/web/www/routino/icons/limit-9.9.png
index 26d58ea..4e2db02 100644
Binary files a/web/www/routino/icons/limit-9.9.png and b/web/www/routino/icons/limit-9.9.png differ
diff --git a/web/www/routino/icons/limit-9.png b/web/www/routino/icons/limit-9.png
index 7538e3b..dd775ae 100644
Binary files a/web/www/routino/icons/limit-9.png and b/web/www/routino/icons/limit-9.png differ
diff --git a/web/www/routino/icons/limit-90.png b/web/www/routino/icons/limit-90.png
index 46d0848..896bbec 100644
Binary files a/web/www/routino/icons/limit-90.png and b/web/www/routino/icons/limit-90.png differ
diff --git a/web/www/routino/icons/limit-91.png b/web/www/routino/icons/limit-91.png
index 2bf5890..e7e92fe 100644
Binary files a/web/www/routino/icons/limit-91.png and b/web/www/routino/icons/limit-91.png differ
diff --git a/web/www/routino/icons/limit-92.png b/web/www/routino/icons/limit-92.png
index 4065a6e..547f0a0 100644
Binary files a/web/www/routino/icons/limit-92.png and b/web/www/routino/icons/limit-92.png differ
diff --git a/web/www/routino/icons/limit-93.png b/web/www/routino/icons/limit-93.png
index 4ca6c89..36b7392 100644
Binary files a/web/www/routino/icons/limit-93.png and b/web/www/routino/icons/limit-93.png differ
diff --git a/web/www/routino/icons/limit-94.png b/web/www/routino/icons/limit-94.png
index 76205ae..de85a70 100644
Binary files a/web/www/routino/icons/limit-94.png and b/web/www/routino/icons/limit-94.png differ
diff --git a/web/www/routino/icons/limit-95.png b/web/www/routino/icons/limit-95.png
index 39ebcb2..a55c23c 100644
Binary files a/web/www/routino/icons/limit-95.png and b/web/www/routino/icons/limit-95.png differ
diff --git a/web/www/routino/icons/limit-96.png b/web/www/routino/icons/limit-96.png
index 28cbc2f..1bd9315 100644
Binary files a/web/www/routino/icons/limit-96.png and b/web/www/routino/icons/limit-96.png differ
diff --git a/web/www/routino/icons/limit-97.png b/web/www/routino/icons/limit-97.png
index 9e9a42e..f474661 100644
Binary files a/web/www/routino/icons/limit-97.png and b/web/www/routino/icons/limit-97.png differ
diff --git a/web/www/routino/icons/limit-98.png b/web/www/routino/icons/limit-98.png
index 69d89ab..b95edbd 100644
Binary files a/web/www/routino/icons/limit-98.png and b/web/www/routino/icons/limit-98.png differ
diff --git a/web/www/routino/icons/limit-99.png b/web/www/routino/icons/limit-99.png
index ef58b46..74aaab3 100644
Binary files a/web/www/routino/icons/limit-99.png and b/web/www/routino/icons/limit-99.png differ
diff --git a/web/www/routino/icons/limit-no.png b/web/www/routino/icons/limit-no.png
index af89057..27ef86d 100644
Binary files a/web/www/routino/icons/limit-no.png and b/web/www/routino/icons/limit-no.png differ
diff --git a/web/www/routino/icons/marker-1-grey.png b/web/www/routino/icons/marker-1-grey.png
index 9478b5c..ebcdee3 100644
Binary files a/web/www/routino/icons/marker-1-grey.png and b/web/www/routino/icons/marker-1-grey.png differ
diff --git a/web/www/routino/icons/marker-1-red.png b/web/www/routino/icons/marker-1-red.png
index a942119..ee063a7 100644
Binary files a/web/www/routino/icons/marker-1-red.png and b/web/www/routino/icons/marker-1-red.png differ
diff --git a/web/www/routino/icons/marker-10-grey.png b/web/www/routino/icons/marker-10-grey.png
index 854a01b..b3046d3 100644
Binary files a/web/www/routino/icons/marker-10-grey.png and b/web/www/routino/icons/marker-10-grey.png differ
diff --git a/web/www/routino/icons/marker-10-red.png b/web/www/routino/icons/marker-10-red.png
index 6cd03a6..71da674 100644
Binary files a/web/www/routino/icons/marker-10-red.png and b/web/www/routino/icons/marker-10-red.png differ
diff --git a/web/www/routino/icons/marker-11-grey.png b/web/www/routino/icons/marker-11-grey.png
index 218d042..7e23da7 100644
Binary files a/web/www/routino/icons/marker-11-grey.png and b/web/www/routino/icons/marker-11-grey.png differ
diff --git a/web/www/routino/icons/marker-11-red.png b/web/www/routino/icons/marker-11-red.png
index ffe9202..16cda2a 100644
Binary files a/web/www/routino/icons/marker-11-red.png and b/web/www/routino/icons/marker-11-red.png differ
diff --git a/web/www/routino/icons/marker-12-grey.png b/web/www/routino/icons/marker-12-grey.png
index 2f728bf..2d83ab5 100644
Binary files a/web/www/routino/icons/marker-12-grey.png and b/web/www/routino/icons/marker-12-grey.png differ
diff --git a/web/www/routino/icons/marker-12-red.png b/web/www/routino/icons/marker-12-red.png
index 0596034..ec459e0 100644
Binary files a/web/www/routino/icons/marker-12-red.png and b/web/www/routino/icons/marker-12-red.png differ
diff --git a/web/www/routino/icons/marker-13-grey.png b/web/www/routino/icons/marker-13-grey.png
index c70c390..ac09ba6 100644
Binary files a/web/www/routino/icons/marker-13-grey.png and b/web/www/routino/icons/marker-13-grey.png differ
diff --git a/web/www/routino/icons/marker-13-red.png b/web/www/routino/icons/marker-13-red.png
index 6949ea9..59866da 100644
Binary files a/web/www/routino/icons/marker-13-red.png and b/web/www/routino/icons/marker-13-red.png differ
diff --git a/web/www/routino/icons/marker-14-grey.png b/web/www/routino/icons/marker-14-grey.png
index 81e11ad..e8e8bff 100644
Binary files a/web/www/routino/icons/marker-14-grey.png and b/web/www/routino/icons/marker-14-grey.png differ
diff --git a/web/www/routino/icons/marker-14-red.png b/web/www/routino/icons/marker-14-red.png
index afcf8ba..604b3ac 100644
Binary files a/web/www/routino/icons/marker-14-red.png and b/web/www/routino/icons/marker-14-red.png differ
diff --git a/web/www/routino/icons/marker-15-grey.png b/web/www/routino/icons/marker-15-grey.png
index 1d81834..d0cdb00 100644
Binary files a/web/www/routino/icons/marker-15-grey.png and b/web/www/routino/icons/marker-15-grey.png differ
diff --git a/web/www/routino/icons/marker-15-red.png b/web/www/routino/icons/marker-15-red.png
index 8368c14..aa6f9eb 100644
Binary files a/web/www/routino/icons/marker-15-red.png and b/web/www/routino/icons/marker-15-red.png differ
diff --git a/web/www/routino/icons/marker-16-grey.png b/web/www/routino/icons/marker-16-grey.png
index b784c25..430278e 100644
Binary files a/web/www/routino/icons/marker-16-grey.png and b/web/www/routino/icons/marker-16-grey.png differ
diff --git a/web/www/routino/icons/marker-16-red.png b/web/www/routino/icons/marker-16-red.png
index ce829ab..1623f20 100644
Binary files a/web/www/routino/icons/marker-16-red.png and b/web/www/routino/icons/marker-16-red.png differ
diff --git a/web/www/routino/icons/marker-17-grey.png b/web/www/routino/icons/marker-17-grey.png
index 26eab2a..7a9ee85 100644
Binary files a/web/www/routino/icons/marker-17-grey.png and b/web/www/routino/icons/marker-17-grey.png differ
diff --git a/web/www/routino/icons/marker-17-red.png b/web/www/routino/icons/marker-17-red.png
index 465578a..f9c51af 100644
Binary files a/web/www/routino/icons/marker-17-red.png and b/web/www/routino/icons/marker-17-red.png differ
diff --git a/web/www/routino/icons/marker-18-grey.png b/web/www/routino/icons/marker-18-grey.png
index 50c84f4..879e969 100644
Binary files a/web/www/routino/icons/marker-18-grey.png and b/web/www/routino/icons/marker-18-grey.png differ
diff --git a/web/www/routino/icons/marker-18-red.png b/web/www/routino/icons/marker-18-red.png
index de83fe7..d1ebbe7 100644
Binary files a/web/www/routino/icons/marker-18-red.png and b/web/www/routino/icons/marker-18-red.png differ
diff --git a/web/www/routino/icons/marker-19-grey.png b/web/www/routino/icons/marker-19-grey.png
index 73d4b31..8c52a3d 100644
Binary files a/web/www/routino/icons/marker-19-grey.png and b/web/www/routino/icons/marker-19-grey.png differ
diff --git a/web/www/routino/icons/marker-19-red.png b/web/www/routino/icons/marker-19-red.png
index 100ee59..6e39293 100644
Binary files a/web/www/routino/icons/marker-19-red.png and b/web/www/routino/icons/marker-19-red.png differ
diff --git a/web/www/routino/icons/marker-2-grey.png b/web/www/routino/icons/marker-2-grey.png
index 5c5e6f3..bd4c3a0 100644
Binary files a/web/www/routino/icons/marker-2-grey.png and b/web/www/routino/icons/marker-2-grey.png differ
diff --git a/web/www/routino/icons/marker-2-red.png b/web/www/routino/icons/marker-2-red.png
index 8740e37..0dc22dd 100644
Binary files a/web/www/routino/icons/marker-2-red.png and b/web/www/routino/icons/marker-2-red.png differ
diff --git a/web/www/routino/icons/marker-20-grey.png b/web/www/routino/icons/marker-20-grey.png
index 3e20379..674c969 100644
Binary files a/web/www/routino/icons/marker-20-grey.png and b/web/www/routino/icons/marker-20-grey.png differ
diff --git a/web/www/routino/icons/marker-20-red.png b/web/www/routino/icons/marker-20-red.png
index b82b5ef..dbd9d28 100644
Binary files a/web/www/routino/icons/marker-20-red.png and b/web/www/routino/icons/marker-20-red.png differ
diff --git a/web/www/routino/icons/marker-21-grey.png b/web/www/routino/icons/marker-21-grey.png
index 6b326b6..9df6d3e 100644
Binary files a/web/www/routino/icons/marker-21-grey.png and b/web/www/routino/icons/marker-21-grey.png differ
diff --git a/web/www/routino/icons/marker-21-red.png b/web/www/routino/icons/marker-21-red.png
index 913de1d..7759c11 100644
Binary files a/web/www/routino/icons/marker-21-red.png and b/web/www/routino/icons/marker-21-red.png differ
diff --git a/web/www/routino/icons/marker-22-grey.png b/web/www/routino/icons/marker-22-grey.png
index 6eb3a5e..032dfe3 100644
Binary files a/web/www/routino/icons/marker-22-grey.png and b/web/www/routino/icons/marker-22-grey.png differ
diff --git a/web/www/routino/icons/marker-22-red.png b/web/www/routino/icons/marker-22-red.png
index 15cff53..e22b56c 100644
Binary files a/web/www/routino/icons/marker-22-red.png and b/web/www/routino/icons/marker-22-red.png differ
diff --git a/web/www/routino/icons/marker-23-grey.png b/web/www/routino/icons/marker-23-grey.png
index 99d6d82..820fc36 100644
Binary files a/web/www/routino/icons/marker-23-grey.png and b/web/www/routino/icons/marker-23-grey.png differ
diff --git a/web/www/routino/icons/marker-23-red.png b/web/www/routino/icons/marker-23-red.png
index c8ab0cd..c490c76 100644
Binary files a/web/www/routino/icons/marker-23-red.png and b/web/www/routino/icons/marker-23-red.png differ
diff --git a/web/www/routino/icons/marker-24-grey.png b/web/www/routino/icons/marker-24-grey.png
index 327f9ad..5acc744 100644
Binary files a/web/www/routino/icons/marker-24-grey.png and b/web/www/routino/icons/marker-24-grey.png differ
diff --git a/web/www/routino/icons/marker-24-red.png b/web/www/routino/icons/marker-24-red.png
index 6943d48..ae85e32 100644
Binary files a/web/www/routino/icons/marker-24-red.png and b/web/www/routino/icons/marker-24-red.png differ
diff --git a/web/www/routino/icons/marker-25-grey.png b/web/www/routino/icons/marker-25-grey.png
index 4a64f15..1e5ff42 100644
Binary files a/web/www/routino/icons/marker-25-grey.png and b/web/www/routino/icons/marker-25-grey.png differ
diff --git a/web/www/routino/icons/marker-25-red.png b/web/www/routino/icons/marker-25-red.png
index 2d95d30..0ee1553 100644
Binary files a/web/www/routino/icons/marker-25-red.png and b/web/www/routino/icons/marker-25-red.png differ
diff --git a/web/www/routino/icons/marker-26-grey.png b/web/www/routino/icons/marker-26-grey.png
index f59e48d..3feb5b5 100644
Binary files a/web/www/routino/icons/marker-26-grey.png and b/web/www/routino/icons/marker-26-grey.png differ
diff --git a/web/www/routino/icons/marker-26-red.png b/web/www/routino/icons/marker-26-red.png
index c5f429e..0b62db9 100644
Binary files a/web/www/routino/icons/marker-26-red.png and b/web/www/routino/icons/marker-26-red.png differ
diff --git a/web/www/routino/icons/marker-27-grey.png b/web/www/routino/icons/marker-27-grey.png
index a97e293..16b1330 100644
Binary files a/web/www/routino/icons/marker-27-grey.png and b/web/www/routino/icons/marker-27-grey.png differ
diff --git a/web/www/routino/icons/marker-27-red.png b/web/www/routino/icons/marker-27-red.png
index 61aa092..d8d4d55 100644
Binary files a/web/www/routino/icons/marker-27-red.png and b/web/www/routino/icons/marker-27-red.png differ
diff --git a/web/www/routino/icons/marker-28-grey.png b/web/www/routino/icons/marker-28-grey.png
index 530e640..9d5392c 100644
Binary files a/web/www/routino/icons/marker-28-grey.png and b/web/www/routino/icons/marker-28-grey.png differ
diff --git a/web/www/routino/icons/marker-28-red.png b/web/www/routino/icons/marker-28-red.png
index 5163cf4..6b7fb4e 100644
Binary files a/web/www/routino/icons/marker-28-red.png and b/web/www/routino/icons/marker-28-red.png differ
diff --git a/web/www/routino/icons/marker-29-grey.png b/web/www/routino/icons/marker-29-grey.png
index 596ca7c..f7d71b0 100644
Binary files a/web/www/routino/icons/marker-29-grey.png and b/web/www/routino/icons/marker-29-grey.png differ
diff --git a/web/www/routino/icons/marker-29-red.png b/web/www/routino/icons/marker-29-red.png
index 3e4844c..b4faf27 100644
Binary files a/web/www/routino/icons/marker-29-red.png and b/web/www/routino/icons/marker-29-red.png differ
diff --git a/web/www/routino/icons/marker-3-grey.png b/web/www/routino/icons/marker-3-grey.png
index 6122fda..fba21ba 100644
Binary files a/web/www/routino/icons/marker-3-grey.png and b/web/www/routino/icons/marker-3-grey.png differ
diff --git a/web/www/routino/icons/marker-3-red.png b/web/www/routino/icons/marker-3-red.png
index 43665ad..9db3974 100644
Binary files a/web/www/routino/icons/marker-3-red.png and b/web/www/routino/icons/marker-3-red.png differ
diff --git a/web/www/routino/icons/marker-30-grey.png b/web/www/routino/icons/marker-30-grey.png
index 1ab10a0..b78096e 100644
Binary files a/web/www/routino/icons/marker-30-grey.png and b/web/www/routino/icons/marker-30-grey.png differ
diff --git a/web/www/routino/icons/marker-30-red.png b/web/www/routino/icons/marker-30-red.png
index ac86e79..344189e 100644
Binary files a/web/www/routino/icons/marker-30-red.png and b/web/www/routino/icons/marker-30-red.png differ
diff --git a/web/www/routino/icons/marker-31-grey.png b/web/www/routino/icons/marker-31-grey.png
index 07ce0b8..5d44c45 100644
Binary files a/web/www/routino/icons/marker-31-grey.png and b/web/www/routino/icons/marker-31-grey.png differ
diff --git a/web/www/routino/icons/marker-31-red.png b/web/www/routino/icons/marker-31-red.png
index f10fde6..366f90e 100644
Binary files a/web/www/routino/icons/marker-31-red.png and b/web/www/routino/icons/marker-31-red.png differ
diff --git a/web/www/routino/icons/marker-32-grey.png b/web/www/routino/icons/marker-32-grey.png
index 2e7ab67..d8ea4bf 100644
Binary files a/web/www/routino/icons/marker-32-grey.png and b/web/www/routino/icons/marker-32-grey.png differ
diff --git a/web/www/routino/icons/marker-32-red.png b/web/www/routino/icons/marker-32-red.png
index 94c2cad..421d43c 100644
Binary files a/web/www/routino/icons/marker-32-red.png and b/web/www/routino/icons/marker-32-red.png differ
diff --git a/web/www/routino/icons/marker-33-grey.png b/web/www/routino/icons/marker-33-grey.png
index d1c6082..110b8bf 100644
Binary files a/web/www/routino/icons/marker-33-grey.png and b/web/www/routino/icons/marker-33-grey.png differ
diff --git a/web/www/routino/icons/marker-33-red.png b/web/www/routino/icons/marker-33-red.png
index d311740..8b492a1 100644
Binary files a/web/www/routino/icons/marker-33-red.png and b/web/www/routino/icons/marker-33-red.png differ
diff --git a/web/www/routino/icons/marker-34-grey.png b/web/www/routino/icons/marker-34-grey.png
index c40add9..6e0dcaf 100644
Binary files a/web/www/routino/icons/marker-34-grey.png and b/web/www/routino/icons/marker-34-grey.png differ
diff --git a/web/www/routino/icons/marker-34-red.png b/web/www/routino/icons/marker-34-red.png
index 79e1085..709c393 100644
Binary files a/web/www/routino/icons/marker-34-red.png and b/web/www/routino/icons/marker-34-red.png differ
diff --git a/web/www/routino/icons/marker-35-grey.png b/web/www/routino/icons/marker-35-grey.png
index 395d833..99ad26f 100644
Binary files a/web/www/routino/icons/marker-35-grey.png and b/web/www/routino/icons/marker-35-grey.png differ
diff --git a/web/www/routino/icons/marker-35-red.png b/web/www/routino/icons/marker-35-red.png
index eeea9bd..2ca9108 100644
Binary files a/web/www/routino/icons/marker-35-red.png and b/web/www/routino/icons/marker-35-red.png differ
diff --git a/web/www/routino/icons/marker-36-grey.png b/web/www/routino/icons/marker-36-grey.png
index b4996a7..fbf13d9 100644
Binary files a/web/www/routino/icons/marker-36-grey.png and b/web/www/routino/icons/marker-36-grey.png differ
diff --git a/web/www/routino/icons/marker-36-red.png b/web/www/routino/icons/marker-36-red.png
index eff67d1..ccdf60b 100644
Binary files a/web/www/routino/icons/marker-36-red.png and b/web/www/routino/icons/marker-36-red.png differ
diff --git a/web/www/routino/icons/marker-37-grey.png b/web/www/routino/icons/marker-37-grey.png
index 4b60003..c6546b1 100644
Binary files a/web/www/routino/icons/marker-37-grey.png and b/web/www/routino/icons/marker-37-grey.png differ
diff --git a/web/www/routino/icons/marker-37-red.png b/web/www/routino/icons/marker-37-red.png
index 2d242dc..149b322 100644
Binary files a/web/www/routino/icons/marker-37-red.png and b/web/www/routino/icons/marker-37-red.png differ
diff --git a/web/www/routino/icons/marker-38-grey.png b/web/www/routino/icons/marker-38-grey.png
index 156ca1b..0644290 100644
Binary files a/web/www/routino/icons/marker-38-grey.png and b/web/www/routino/icons/marker-38-grey.png differ
diff --git a/web/www/routino/icons/marker-38-red.png b/web/www/routino/icons/marker-38-red.png
index 22a8b7a..8315551 100644
Binary files a/web/www/routino/icons/marker-38-red.png and b/web/www/routino/icons/marker-38-red.png differ
diff --git a/web/www/routino/icons/marker-39-grey.png b/web/www/routino/icons/marker-39-grey.png
index c342e5d..df5338f 100644
Binary files a/web/www/routino/icons/marker-39-grey.png and b/web/www/routino/icons/marker-39-grey.png differ
diff --git a/web/www/routino/icons/marker-39-red.png b/web/www/routino/icons/marker-39-red.png
index 058a808..3ade1ee 100644
Binary files a/web/www/routino/icons/marker-39-red.png and b/web/www/routino/icons/marker-39-red.png differ
diff --git a/web/www/routino/icons/marker-4-grey.png b/web/www/routino/icons/marker-4-grey.png
index cb64936..506533c 100644
Binary files a/web/www/routino/icons/marker-4-grey.png and b/web/www/routino/icons/marker-4-grey.png differ
diff --git a/web/www/routino/icons/marker-4-red.png b/web/www/routino/icons/marker-4-red.png
index 0a248dc..a80cd75 100644
Binary files a/web/www/routino/icons/marker-4-red.png and b/web/www/routino/icons/marker-4-red.png differ
diff --git a/web/www/routino/icons/marker-40-grey.png b/web/www/routino/icons/marker-40-grey.png
index 7853f08..f032b96 100644
Binary files a/web/www/routino/icons/marker-40-grey.png and b/web/www/routino/icons/marker-40-grey.png differ
diff --git a/web/www/routino/icons/marker-40-red.png b/web/www/routino/icons/marker-40-red.png
index 8fc6ffa..6bb94f6 100644
Binary files a/web/www/routino/icons/marker-40-red.png and b/web/www/routino/icons/marker-40-red.png differ
diff --git a/web/www/routino/icons/marker-41-grey.png b/web/www/routino/icons/marker-41-grey.png
index 1e97924..3e6aa11 100644
Binary files a/web/www/routino/icons/marker-41-grey.png and b/web/www/routino/icons/marker-41-grey.png differ
diff --git a/web/www/routino/icons/marker-41-red.png b/web/www/routino/icons/marker-41-red.png
index c18eada..f6ac81d 100644
Binary files a/web/www/routino/icons/marker-41-red.png and b/web/www/routino/icons/marker-41-red.png differ
diff --git a/web/www/routino/icons/marker-42-grey.png b/web/www/routino/icons/marker-42-grey.png
index b81234d..ccdf050 100644
Binary files a/web/www/routino/icons/marker-42-grey.png and b/web/www/routino/icons/marker-42-grey.png differ
diff --git a/web/www/routino/icons/marker-42-red.png b/web/www/routino/icons/marker-42-red.png
index 8ec5ffe..707057e 100644
Binary files a/web/www/routino/icons/marker-42-red.png and b/web/www/routino/icons/marker-42-red.png differ
diff --git a/web/www/routino/icons/marker-43-grey.png b/web/www/routino/icons/marker-43-grey.png
index 21cb6d5..0cc9364 100644
Binary files a/web/www/routino/icons/marker-43-grey.png and b/web/www/routino/icons/marker-43-grey.png differ
diff --git a/web/www/routino/icons/marker-43-red.png b/web/www/routino/icons/marker-43-red.png
index 18674e4..5c66b61 100644
Binary files a/web/www/routino/icons/marker-43-red.png and b/web/www/routino/icons/marker-43-red.png differ
diff --git a/web/www/routino/icons/marker-44-grey.png b/web/www/routino/icons/marker-44-grey.png
index 39836e3..a01506f 100644
Binary files a/web/www/routino/icons/marker-44-grey.png and b/web/www/routino/icons/marker-44-grey.png differ
diff --git a/web/www/routino/icons/marker-44-red.png b/web/www/routino/icons/marker-44-red.png
index eba1145..8d095d2 100644
Binary files a/web/www/routino/icons/marker-44-red.png and b/web/www/routino/icons/marker-44-red.png differ
diff --git a/web/www/routino/icons/marker-45-grey.png b/web/www/routino/icons/marker-45-grey.png
index b7bd21b..73d280b 100644
Binary files a/web/www/routino/icons/marker-45-grey.png and b/web/www/routino/icons/marker-45-grey.png differ
diff --git a/web/www/routino/icons/marker-45-red.png b/web/www/routino/icons/marker-45-red.png
index 5c3f2a5..140b9dd 100644
Binary files a/web/www/routino/icons/marker-45-red.png and b/web/www/routino/icons/marker-45-red.png differ
diff --git a/web/www/routino/icons/marker-46-grey.png b/web/www/routino/icons/marker-46-grey.png
index 1239847..67e88a5 100644
Binary files a/web/www/routino/icons/marker-46-grey.png and b/web/www/routino/icons/marker-46-grey.png differ
diff --git a/web/www/routino/icons/marker-46-red.png b/web/www/routino/icons/marker-46-red.png
index fa5e930..fa17118 100644
Binary files a/web/www/routino/icons/marker-46-red.png and b/web/www/routino/icons/marker-46-red.png differ
diff --git a/web/www/routino/icons/marker-47-grey.png b/web/www/routino/icons/marker-47-grey.png
index 7b0e3ea..ef10ef0 100644
Binary files a/web/www/routino/icons/marker-47-grey.png and b/web/www/routino/icons/marker-47-grey.png differ
diff --git a/web/www/routino/icons/marker-47-red.png b/web/www/routino/icons/marker-47-red.png
index 10cbadb..c3eb947 100644
Binary files a/web/www/routino/icons/marker-47-red.png and b/web/www/routino/icons/marker-47-red.png differ
diff --git a/web/www/routino/icons/marker-48-grey.png b/web/www/routino/icons/marker-48-grey.png
index 47515f3..09e0fe0 100644
Binary files a/web/www/routino/icons/marker-48-grey.png and b/web/www/routino/icons/marker-48-grey.png differ
diff --git a/web/www/routino/icons/marker-48-red.png b/web/www/routino/icons/marker-48-red.png
index e1b7fbf..75c48d3 100644
Binary files a/web/www/routino/icons/marker-48-red.png and b/web/www/routino/icons/marker-48-red.png differ
diff --git a/web/www/routino/icons/marker-49-grey.png b/web/www/routino/icons/marker-49-grey.png
index f9c331f..d1bfac0 100644
Binary files a/web/www/routino/icons/marker-49-grey.png and b/web/www/routino/icons/marker-49-grey.png differ
diff --git a/web/www/routino/icons/marker-49-red.png b/web/www/routino/icons/marker-49-red.png
index c84983d..d13409e 100644
Binary files a/web/www/routino/icons/marker-49-red.png and b/web/www/routino/icons/marker-49-red.png differ
diff --git a/web/www/routino/icons/marker-5-grey.png b/web/www/routino/icons/marker-5-grey.png
index 823109f..58d0957 100644
Binary files a/web/www/routino/icons/marker-5-grey.png and b/web/www/routino/icons/marker-5-grey.png differ
diff --git a/web/www/routino/icons/marker-5-red.png b/web/www/routino/icons/marker-5-red.png
index f9a5d25..719ee92 100644
Binary files a/web/www/routino/icons/marker-5-red.png and b/web/www/routino/icons/marker-5-red.png differ
diff --git a/web/www/routino/icons/marker-50-grey.png b/web/www/routino/icons/marker-50-grey.png
index 8063a29..e248e11 100644
Binary files a/web/www/routino/icons/marker-50-grey.png and b/web/www/routino/icons/marker-50-grey.png differ
diff --git a/web/www/routino/icons/marker-50-red.png b/web/www/routino/icons/marker-50-red.png
index 9b48c2d..9b2446a 100644
Binary files a/web/www/routino/icons/marker-50-red.png and b/web/www/routino/icons/marker-50-red.png differ
diff --git a/web/www/routino/icons/marker-51-grey.png b/web/www/routino/icons/marker-51-grey.png
index 20dfd56..f27ef1f 100644
Binary files a/web/www/routino/icons/marker-51-grey.png and b/web/www/routino/icons/marker-51-grey.png differ
diff --git a/web/www/routino/icons/marker-51-red.png b/web/www/routino/icons/marker-51-red.png
index 04c6bf2..f92abea 100644
Binary files a/web/www/routino/icons/marker-51-red.png and b/web/www/routino/icons/marker-51-red.png differ
diff --git a/web/www/routino/icons/marker-52-grey.png b/web/www/routino/icons/marker-52-grey.png
index 8e59de3..191f29f 100644
Binary files a/web/www/routino/icons/marker-52-grey.png and b/web/www/routino/icons/marker-52-grey.png differ
diff --git a/web/www/routino/icons/marker-52-red.png b/web/www/routino/icons/marker-52-red.png
index f5895c9..2cdcc2b 100644
Binary files a/web/www/routino/icons/marker-52-red.png and b/web/www/routino/icons/marker-52-red.png differ
diff --git a/web/www/routino/icons/marker-53-grey.png b/web/www/routino/icons/marker-53-grey.png
index 0d75a4d..41f352d 100644
Binary files a/web/www/routino/icons/marker-53-grey.png and b/web/www/routino/icons/marker-53-grey.png differ
diff --git a/web/www/routino/icons/marker-53-red.png b/web/www/routino/icons/marker-53-red.png
index c7732ab..ff82480 100644
Binary files a/web/www/routino/icons/marker-53-red.png and b/web/www/routino/icons/marker-53-red.png differ
diff --git a/web/www/routino/icons/marker-54-grey.png b/web/www/routino/icons/marker-54-grey.png
index 6bff1ad..858c0a3 100644
Binary files a/web/www/routino/icons/marker-54-grey.png and b/web/www/routino/icons/marker-54-grey.png differ
diff --git a/web/www/routino/icons/marker-54-red.png b/web/www/routino/icons/marker-54-red.png
index 8542606..9f5ae54 100644
Binary files a/web/www/routino/icons/marker-54-red.png and b/web/www/routino/icons/marker-54-red.png differ
diff --git a/web/www/routino/icons/marker-55-grey.png b/web/www/routino/icons/marker-55-grey.png
index de1b37d..7cb060f 100644
Binary files a/web/www/routino/icons/marker-55-grey.png and b/web/www/routino/icons/marker-55-grey.png differ
diff --git a/web/www/routino/icons/marker-55-red.png b/web/www/routino/icons/marker-55-red.png
index 90bce21..5a42bcb 100644
Binary files a/web/www/routino/icons/marker-55-red.png and b/web/www/routino/icons/marker-55-red.png differ
diff --git a/web/www/routino/icons/marker-56-grey.png b/web/www/routino/icons/marker-56-grey.png
index 4e943c7..492a0bf 100644
Binary files a/web/www/routino/icons/marker-56-grey.png and b/web/www/routino/icons/marker-56-grey.png differ
diff --git a/web/www/routino/icons/marker-56-red.png b/web/www/routino/icons/marker-56-red.png
index cb16aa3..e8c6338 100644
Binary files a/web/www/routino/icons/marker-56-red.png and b/web/www/routino/icons/marker-56-red.png differ
diff --git a/web/www/routino/icons/marker-57-grey.png b/web/www/routino/icons/marker-57-grey.png
index f208174..49f43e3 100644
Binary files a/web/www/routino/icons/marker-57-grey.png and b/web/www/routino/icons/marker-57-grey.png differ
diff --git a/web/www/routino/icons/marker-57-red.png b/web/www/routino/icons/marker-57-red.png
index 3a19d78..2865933 100644
Binary files a/web/www/routino/icons/marker-57-red.png and b/web/www/routino/icons/marker-57-red.png differ
diff --git a/web/www/routino/icons/marker-58-grey.png b/web/www/routino/icons/marker-58-grey.png
index 87e70ec..9578226 100644
Binary files a/web/www/routino/icons/marker-58-grey.png and b/web/www/routino/icons/marker-58-grey.png differ
diff --git a/web/www/routino/icons/marker-58-red.png b/web/www/routino/icons/marker-58-red.png
index f19a8a6..a137929 100644
Binary files a/web/www/routino/icons/marker-58-red.png and b/web/www/routino/icons/marker-58-red.png differ
diff --git a/web/www/routino/icons/marker-59-grey.png b/web/www/routino/icons/marker-59-grey.png
index c6f03d5..ae41745 100644
Binary files a/web/www/routino/icons/marker-59-grey.png and b/web/www/routino/icons/marker-59-grey.png differ
diff --git a/web/www/routino/icons/marker-59-red.png b/web/www/routino/icons/marker-59-red.png
index 29fff75..d4b3f1b 100644
Binary files a/web/www/routino/icons/marker-59-red.png and b/web/www/routino/icons/marker-59-red.png differ
diff --git a/web/www/routino/icons/marker-6-grey.png b/web/www/routino/icons/marker-6-grey.png
index a39dca6..0bcf7dd 100644
Binary files a/web/www/routino/icons/marker-6-grey.png and b/web/www/routino/icons/marker-6-grey.png differ
diff --git a/web/www/routino/icons/marker-6-red.png b/web/www/routino/icons/marker-6-red.png
index a1e6f81..aa83858 100644
Binary files a/web/www/routino/icons/marker-6-red.png and b/web/www/routino/icons/marker-6-red.png differ
diff --git a/web/www/routino/icons/marker-60-grey.png b/web/www/routino/icons/marker-60-grey.png
index 5d1f3fb..b0b5888 100644
Binary files a/web/www/routino/icons/marker-60-grey.png and b/web/www/routino/icons/marker-60-grey.png differ
diff --git a/web/www/routino/icons/marker-60-red.png b/web/www/routino/icons/marker-60-red.png
index 08684e1..32716e1 100644
Binary files a/web/www/routino/icons/marker-60-red.png and b/web/www/routino/icons/marker-60-red.png differ
diff --git a/web/www/routino/icons/marker-61-grey.png b/web/www/routino/icons/marker-61-grey.png
index 3b49319..0b405c7 100644
Binary files a/web/www/routino/icons/marker-61-grey.png and b/web/www/routino/icons/marker-61-grey.png differ
diff --git a/web/www/routino/icons/marker-61-red.png b/web/www/routino/icons/marker-61-red.png
index 10f95f1..582e68a 100644
Binary files a/web/www/routino/icons/marker-61-red.png and b/web/www/routino/icons/marker-61-red.png differ
diff --git a/web/www/routino/icons/marker-62-grey.png b/web/www/routino/icons/marker-62-grey.png
index 8c91171..2ce2e81 100644
Binary files a/web/www/routino/icons/marker-62-grey.png and b/web/www/routino/icons/marker-62-grey.png differ
diff --git a/web/www/routino/icons/marker-62-red.png b/web/www/routino/icons/marker-62-red.png
index 9fa37b7..697e423 100644
Binary files a/web/www/routino/icons/marker-62-red.png and b/web/www/routino/icons/marker-62-red.png differ
diff --git a/web/www/routino/icons/marker-63-grey.png b/web/www/routino/icons/marker-63-grey.png
index bdf2e12..6c70abb 100644
Binary files a/web/www/routino/icons/marker-63-grey.png and b/web/www/routino/icons/marker-63-grey.png differ
diff --git a/web/www/routino/icons/marker-63-red.png b/web/www/routino/icons/marker-63-red.png
index 3a288b6..45029e0 100644
Binary files a/web/www/routino/icons/marker-63-red.png and b/web/www/routino/icons/marker-63-red.png differ
diff --git a/web/www/routino/icons/marker-64-grey.png b/web/www/routino/icons/marker-64-grey.png
index e5ea279..a7a8be2 100644
Binary files a/web/www/routino/icons/marker-64-grey.png and b/web/www/routino/icons/marker-64-grey.png differ
diff --git a/web/www/routino/icons/marker-64-red.png b/web/www/routino/icons/marker-64-red.png
index 0fc91bf..6c23633 100644
Binary files a/web/www/routino/icons/marker-64-red.png and b/web/www/routino/icons/marker-64-red.png differ
diff --git a/web/www/routino/icons/marker-65-grey.png b/web/www/routino/icons/marker-65-grey.png
index ab2d822..8c5dd8f 100644
Binary files a/web/www/routino/icons/marker-65-grey.png and b/web/www/routino/icons/marker-65-grey.png differ
diff --git a/web/www/routino/icons/marker-65-red.png b/web/www/routino/icons/marker-65-red.png
index 4a3df5e..25e195d 100644
Binary files a/web/www/routino/icons/marker-65-red.png and b/web/www/routino/icons/marker-65-red.png differ
diff --git a/web/www/routino/icons/marker-66-grey.png b/web/www/routino/icons/marker-66-grey.png
index 87be57b..2587a65 100644
Binary files a/web/www/routino/icons/marker-66-grey.png and b/web/www/routino/icons/marker-66-grey.png differ
diff --git a/web/www/routino/icons/marker-66-red.png b/web/www/routino/icons/marker-66-red.png
index 12afdc7..a759991 100644
Binary files a/web/www/routino/icons/marker-66-red.png and b/web/www/routino/icons/marker-66-red.png differ
diff --git a/web/www/routino/icons/marker-67-grey.png b/web/www/routino/icons/marker-67-grey.png
index b6d93e7..96c719d 100644
Binary files a/web/www/routino/icons/marker-67-grey.png and b/web/www/routino/icons/marker-67-grey.png differ
diff --git a/web/www/routino/icons/marker-67-red.png b/web/www/routino/icons/marker-67-red.png
index 13f7cbc..60223fb 100644
Binary files a/web/www/routino/icons/marker-67-red.png and b/web/www/routino/icons/marker-67-red.png differ
diff --git a/web/www/routino/icons/marker-68-grey.png b/web/www/routino/icons/marker-68-grey.png
index d4a2b78..baf7cf3 100644
Binary files a/web/www/routino/icons/marker-68-grey.png and b/web/www/routino/icons/marker-68-grey.png differ
diff --git a/web/www/routino/icons/marker-68-red.png b/web/www/routino/icons/marker-68-red.png
index 3d4c1c0..c8e1a9e 100644
Binary files a/web/www/routino/icons/marker-68-red.png and b/web/www/routino/icons/marker-68-red.png differ
diff --git a/web/www/routino/icons/marker-69-grey.png b/web/www/routino/icons/marker-69-grey.png
index 22bd3b7..1bb71e8 100644
Binary files a/web/www/routino/icons/marker-69-grey.png and b/web/www/routino/icons/marker-69-grey.png differ
diff --git a/web/www/routino/icons/marker-69-red.png b/web/www/routino/icons/marker-69-red.png
index 7e0a36c..b2abfa0 100644
Binary files a/web/www/routino/icons/marker-69-red.png and b/web/www/routino/icons/marker-69-red.png differ
diff --git a/web/www/routino/icons/marker-7-grey.png b/web/www/routino/icons/marker-7-grey.png
index 6e02bf3..8cd4e67 100644
Binary files a/web/www/routino/icons/marker-7-grey.png and b/web/www/routino/icons/marker-7-grey.png differ
diff --git a/web/www/routino/icons/marker-7-red.png b/web/www/routino/icons/marker-7-red.png
index 8d5e098..468edf6 100644
Binary files a/web/www/routino/icons/marker-7-red.png and b/web/www/routino/icons/marker-7-red.png differ
diff --git a/web/www/routino/icons/marker-70-grey.png b/web/www/routino/icons/marker-70-grey.png
index e9e7787..81692c2 100644
Binary files a/web/www/routino/icons/marker-70-grey.png and b/web/www/routino/icons/marker-70-grey.png differ
diff --git a/web/www/routino/icons/marker-70-red.png b/web/www/routino/icons/marker-70-red.png
index 7847b57..88e405e 100644
Binary files a/web/www/routino/icons/marker-70-red.png and b/web/www/routino/icons/marker-70-red.png differ
diff --git a/web/www/routino/icons/marker-71-grey.png b/web/www/routino/icons/marker-71-grey.png
index 9b80fcc..3d4b0fc 100644
Binary files a/web/www/routino/icons/marker-71-grey.png and b/web/www/routino/icons/marker-71-grey.png differ
diff --git a/web/www/routino/icons/marker-71-red.png b/web/www/routino/icons/marker-71-red.png
index 4a620b2..4e8f92b 100644
Binary files a/web/www/routino/icons/marker-71-red.png and b/web/www/routino/icons/marker-71-red.png differ
diff --git a/web/www/routino/icons/marker-72-grey.png b/web/www/routino/icons/marker-72-grey.png
index 57ca6ff..a65f31a 100644
Binary files a/web/www/routino/icons/marker-72-grey.png and b/web/www/routino/icons/marker-72-grey.png differ
diff --git a/web/www/routino/icons/marker-72-red.png b/web/www/routino/icons/marker-72-red.png
index 74aec09..7203575 100644
Binary files a/web/www/routino/icons/marker-72-red.png and b/web/www/routino/icons/marker-72-red.png differ
diff --git a/web/www/routino/icons/marker-73-grey.png b/web/www/routino/icons/marker-73-grey.png
index c0689b6..c5a774b 100644
Binary files a/web/www/routino/icons/marker-73-grey.png and b/web/www/routino/icons/marker-73-grey.png differ
diff --git a/web/www/routino/icons/marker-73-red.png b/web/www/routino/icons/marker-73-red.png
index 43d07ee..ef5a5c0 100644
Binary files a/web/www/routino/icons/marker-73-red.png and b/web/www/routino/icons/marker-73-red.png differ
diff --git a/web/www/routino/icons/marker-74-grey.png b/web/www/routino/icons/marker-74-grey.png
index 07557ad..09c1800 100644
Binary files a/web/www/routino/icons/marker-74-grey.png and b/web/www/routino/icons/marker-74-grey.png differ
diff --git a/web/www/routino/icons/marker-74-red.png b/web/www/routino/icons/marker-74-red.png
index 41cb529..c32aa55 100644
Binary files a/web/www/routino/icons/marker-74-red.png and b/web/www/routino/icons/marker-74-red.png differ
diff --git a/web/www/routino/icons/marker-75-grey.png b/web/www/routino/icons/marker-75-grey.png
index b678c8b..6f4863f 100644
Binary files a/web/www/routino/icons/marker-75-grey.png and b/web/www/routino/icons/marker-75-grey.png differ
diff --git a/web/www/routino/icons/marker-75-red.png b/web/www/routino/icons/marker-75-red.png
index f302307..646037a 100644
Binary files a/web/www/routino/icons/marker-75-red.png and b/web/www/routino/icons/marker-75-red.png differ
diff --git a/web/www/routino/icons/marker-76-grey.png b/web/www/routino/icons/marker-76-grey.png
index 41d195d..5661747 100644
Binary files a/web/www/routino/icons/marker-76-grey.png and b/web/www/routino/icons/marker-76-grey.png differ
diff --git a/web/www/routino/icons/marker-76-red.png b/web/www/routino/icons/marker-76-red.png
index dd7c8e0..a793f1c 100644
Binary files a/web/www/routino/icons/marker-76-red.png and b/web/www/routino/icons/marker-76-red.png differ
diff --git a/web/www/routino/icons/marker-77-grey.png b/web/www/routino/icons/marker-77-grey.png
index f3bb71e..65e1260 100644
Binary files a/web/www/routino/icons/marker-77-grey.png and b/web/www/routino/icons/marker-77-grey.png differ
diff --git a/web/www/routino/icons/marker-77-red.png b/web/www/routino/icons/marker-77-red.png
index 05e75e5..cf330de 100644
Binary files a/web/www/routino/icons/marker-77-red.png and b/web/www/routino/icons/marker-77-red.png differ
diff --git a/web/www/routino/icons/marker-78-grey.png b/web/www/routino/icons/marker-78-grey.png
index 769d156..dbfad0b 100644
Binary files a/web/www/routino/icons/marker-78-grey.png and b/web/www/routino/icons/marker-78-grey.png differ
diff --git a/web/www/routino/icons/marker-78-red.png b/web/www/routino/icons/marker-78-red.png
index d1cd290..5b0a4a3 100644
Binary files a/web/www/routino/icons/marker-78-red.png and b/web/www/routino/icons/marker-78-red.png differ
diff --git a/web/www/routino/icons/marker-79-grey.png b/web/www/routino/icons/marker-79-grey.png
index c9b60bc..0acc01a 100644
Binary files a/web/www/routino/icons/marker-79-grey.png and b/web/www/routino/icons/marker-79-grey.png differ
diff --git a/web/www/routino/icons/marker-79-red.png b/web/www/routino/icons/marker-79-red.png
index 9e035c1..5eaac3c 100644
Binary files a/web/www/routino/icons/marker-79-red.png and b/web/www/routino/icons/marker-79-red.png differ
diff --git a/web/www/routino/icons/marker-8-grey.png b/web/www/routino/icons/marker-8-grey.png
index 3d7827b..7f0ad5b 100644
Binary files a/web/www/routino/icons/marker-8-grey.png and b/web/www/routino/icons/marker-8-grey.png differ
diff --git a/web/www/routino/icons/marker-8-red.png b/web/www/routino/icons/marker-8-red.png
index 1619a9f..b50c2b3 100644
Binary files a/web/www/routino/icons/marker-8-red.png and b/web/www/routino/icons/marker-8-red.png differ
diff --git a/web/www/routino/icons/marker-80-grey.png b/web/www/routino/icons/marker-80-grey.png
index 3c44376..7bc7656 100644
Binary files a/web/www/routino/icons/marker-80-grey.png and b/web/www/routino/icons/marker-80-grey.png differ
diff --git a/web/www/routino/icons/marker-80-red.png b/web/www/routino/icons/marker-80-red.png
index 863508e..f78095e 100644
Binary files a/web/www/routino/icons/marker-80-red.png and b/web/www/routino/icons/marker-80-red.png differ
diff --git a/web/www/routino/icons/marker-81-grey.png b/web/www/routino/icons/marker-81-grey.png
index df77564..499d4a4 100644
Binary files a/web/www/routino/icons/marker-81-grey.png and b/web/www/routino/icons/marker-81-grey.png differ
diff --git a/web/www/routino/icons/marker-81-red.png b/web/www/routino/icons/marker-81-red.png
index 441ff6c..004847b 100644
Binary files a/web/www/routino/icons/marker-81-red.png and b/web/www/routino/icons/marker-81-red.png differ
diff --git a/web/www/routino/icons/marker-82-grey.png b/web/www/routino/icons/marker-82-grey.png
index 80dbabb..7339544 100644
Binary files a/web/www/routino/icons/marker-82-grey.png and b/web/www/routino/icons/marker-82-grey.png differ
diff --git a/web/www/routino/icons/marker-82-red.png b/web/www/routino/icons/marker-82-red.png
index 62d6892..c5fb989 100644
Binary files a/web/www/routino/icons/marker-82-red.png and b/web/www/routino/icons/marker-82-red.png differ
diff --git a/web/www/routino/icons/marker-83-grey.png b/web/www/routino/icons/marker-83-grey.png
index 3b495cb..1f1fb88 100644
Binary files a/web/www/routino/icons/marker-83-grey.png and b/web/www/routino/icons/marker-83-grey.png differ
diff --git a/web/www/routino/icons/marker-83-red.png b/web/www/routino/icons/marker-83-red.png
index 4712d1f..f64f777 100644
Binary files a/web/www/routino/icons/marker-83-red.png and b/web/www/routino/icons/marker-83-red.png differ
diff --git a/web/www/routino/icons/marker-84-grey.png b/web/www/routino/icons/marker-84-grey.png
index b88e6a1..3db6470 100644
Binary files a/web/www/routino/icons/marker-84-grey.png and b/web/www/routino/icons/marker-84-grey.png differ
diff --git a/web/www/routino/icons/marker-84-red.png b/web/www/routino/icons/marker-84-red.png
index 751f0bf..5a6e118 100644
Binary files a/web/www/routino/icons/marker-84-red.png and b/web/www/routino/icons/marker-84-red.png differ
diff --git a/web/www/routino/icons/marker-85-grey.png b/web/www/routino/icons/marker-85-grey.png
index 7f91f05..5b57d79 100644
Binary files a/web/www/routino/icons/marker-85-grey.png and b/web/www/routino/icons/marker-85-grey.png differ
diff --git a/web/www/routino/icons/marker-85-red.png b/web/www/routino/icons/marker-85-red.png
index 6c4e983..789fe18 100644
Binary files a/web/www/routino/icons/marker-85-red.png and b/web/www/routino/icons/marker-85-red.png differ
diff --git a/web/www/routino/icons/marker-86-grey.png b/web/www/routino/icons/marker-86-grey.png
index a1ab145..1c9577c 100644
Binary files a/web/www/routino/icons/marker-86-grey.png and b/web/www/routino/icons/marker-86-grey.png differ
diff --git a/web/www/routino/icons/marker-86-red.png b/web/www/routino/icons/marker-86-red.png
index 7a75cc1..815328c 100644
Binary files a/web/www/routino/icons/marker-86-red.png and b/web/www/routino/icons/marker-86-red.png differ
diff --git a/web/www/routino/icons/marker-87-grey.png b/web/www/routino/icons/marker-87-grey.png
index 9c85f2b..1edb73e 100644
Binary files a/web/www/routino/icons/marker-87-grey.png and b/web/www/routino/icons/marker-87-grey.png differ
diff --git a/web/www/routino/icons/marker-87-red.png b/web/www/routino/icons/marker-87-red.png
index e4a2dc7..b421502 100644
Binary files a/web/www/routino/icons/marker-87-red.png and b/web/www/routino/icons/marker-87-red.png differ
diff --git a/web/www/routino/icons/marker-88-grey.png b/web/www/routino/icons/marker-88-grey.png
index ad1d413..4ce6784 100644
Binary files a/web/www/routino/icons/marker-88-grey.png and b/web/www/routino/icons/marker-88-grey.png differ
diff --git a/web/www/routino/icons/marker-88-red.png b/web/www/routino/icons/marker-88-red.png
index c5d0d16..dc622db 100644
Binary files a/web/www/routino/icons/marker-88-red.png and b/web/www/routino/icons/marker-88-red.png differ
diff --git a/web/www/routino/icons/marker-89-grey.png b/web/www/routino/icons/marker-89-grey.png
index b191a43..cecb847 100644
Binary files a/web/www/routino/icons/marker-89-grey.png and b/web/www/routino/icons/marker-89-grey.png differ
diff --git a/web/www/routino/icons/marker-89-red.png b/web/www/routino/icons/marker-89-red.png
index b1f9bc6..dfea2d7 100644
Binary files a/web/www/routino/icons/marker-89-red.png and b/web/www/routino/icons/marker-89-red.png differ
diff --git a/web/www/routino/icons/marker-9-grey.png b/web/www/routino/icons/marker-9-grey.png
index 76ae425..79e30b8 100644
Binary files a/web/www/routino/icons/marker-9-grey.png and b/web/www/routino/icons/marker-9-grey.png differ
diff --git a/web/www/routino/icons/marker-9-red.png b/web/www/routino/icons/marker-9-red.png
index 5a6e87b..cc4f588 100644
Binary files a/web/www/routino/icons/marker-9-red.png and b/web/www/routino/icons/marker-9-red.png differ
diff --git a/web/www/routino/icons/marker-90-grey.png b/web/www/routino/icons/marker-90-grey.png
index 12ede3e..b5ca1cc 100644
Binary files a/web/www/routino/icons/marker-90-grey.png and b/web/www/routino/icons/marker-90-grey.png differ
diff --git a/web/www/routino/icons/marker-90-red.png b/web/www/routino/icons/marker-90-red.png
index c601238..ddd8565 100644
Binary files a/web/www/routino/icons/marker-90-red.png and b/web/www/routino/icons/marker-90-red.png differ
diff --git a/web/www/routino/icons/marker-91-grey.png b/web/www/routino/icons/marker-91-grey.png
index d35eb69..5144f8b 100644
Binary files a/web/www/routino/icons/marker-91-grey.png and b/web/www/routino/icons/marker-91-grey.png differ
diff --git a/web/www/routino/icons/marker-91-red.png b/web/www/routino/icons/marker-91-red.png
index e3ad777..0297066 100644
Binary files a/web/www/routino/icons/marker-91-red.png and b/web/www/routino/icons/marker-91-red.png differ
diff --git a/web/www/routino/icons/marker-92-grey.png b/web/www/routino/icons/marker-92-grey.png
index da697b2..8f72f6d 100644
Binary files a/web/www/routino/icons/marker-92-grey.png and b/web/www/routino/icons/marker-92-grey.png differ
diff --git a/web/www/routino/icons/marker-92-red.png b/web/www/routino/icons/marker-92-red.png
index 409173f..0606d5d 100644
Binary files a/web/www/routino/icons/marker-92-red.png and b/web/www/routino/icons/marker-92-red.png differ
diff --git a/web/www/routino/icons/marker-93-grey.png b/web/www/routino/icons/marker-93-grey.png
index 5b57dd0..ca59246 100644
Binary files a/web/www/routino/icons/marker-93-grey.png and b/web/www/routino/icons/marker-93-grey.png differ
diff --git a/web/www/routino/icons/marker-93-red.png b/web/www/routino/icons/marker-93-red.png
index e7483a2..5e81687 100644
Binary files a/web/www/routino/icons/marker-93-red.png and b/web/www/routino/icons/marker-93-red.png differ
diff --git a/web/www/routino/icons/marker-94-grey.png b/web/www/routino/icons/marker-94-grey.png
index 737a166..e0fe3d1 100644
Binary files a/web/www/routino/icons/marker-94-grey.png and b/web/www/routino/icons/marker-94-grey.png differ
diff --git a/web/www/routino/icons/marker-94-red.png b/web/www/routino/icons/marker-94-red.png
index 47256e5..7287026 100644
Binary files a/web/www/routino/icons/marker-94-red.png and b/web/www/routino/icons/marker-94-red.png differ
diff --git a/web/www/routino/icons/marker-95-grey.png b/web/www/routino/icons/marker-95-grey.png
index e00d7dd..030e665 100644
Binary files a/web/www/routino/icons/marker-95-grey.png and b/web/www/routino/icons/marker-95-grey.png differ
diff --git a/web/www/routino/icons/marker-95-red.png b/web/www/routino/icons/marker-95-red.png
index 4b1d2dc..1fe82fd 100644
Binary files a/web/www/routino/icons/marker-95-red.png and b/web/www/routino/icons/marker-95-red.png differ
diff --git a/web/www/routino/icons/marker-96-grey.png b/web/www/routino/icons/marker-96-grey.png
index 9ba8b70..75414de 100644
Binary files a/web/www/routino/icons/marker-96-grey.png and b/web/www/routino/icons/marker-96-grey.png differ
diff --git a/web/www/routino/icons/marker-96-red.png b/web/www/routino/icons/marker-96-red.png
index 0391f70..0f2c282 100644
Binary files a/web/www/routino/icons/marker-96-red.png and b/web/www/routino/icons/marker-96-red.png differ
diff --git a/web/www/routino/icons/marker-97-grey.png b/web/www/routino/icons/marker-97-grey.png
index 202dc0f..a0d350f 100644
Binary files a/web/www/routino/icons/marker-97-grey.png and b/web/www/routino/icons/marker-97-grey.png differ
diff --git a/web/www/routino/icons/marker-97-red.png b/web/www/routino/icons/marker-97-red.png
index ed60243..9359f51 100644
Binary files a/web/www/routino/icons/marker-97-red.png and b/web/www/routino/icons/marker-97-red.png differ
diff --git a/web/www/routino/icons/marker-98-grey.png b/web/www/routino/icons/marker-98-grey.png
index bb1c952..123aac2 100644
Binary files a/web/www/routino/icons/marker-98-grey.png and b/web/www/routino/icons/marker-98-grey.png differ
diff --git a/web/www/routino/icons/marker-98-red.png b/web/www/routino/icons/marker-98-red.png
index a424be7..a816385 100644
Binary files a/web/www/routino/icons/marker-98-red.png and b/web/www/routino/icons/marker-98-red.png differ
diff --git a/web/www/routino/icons/marker-99-grey.png b/web/www/routino/icons/marker-99-grey.png
index db08043..219dc0e 100644
Binary files a/web/www/routino/icons/marker-99-grey.png and b/web/www/routino/icons/marker-99-grey.png differ
diff --git a/web/www/routino/icons/marker-99-red.png b/web/www/routino/icons/marker-99-red.png
index 268f7d9..2d26662 100644
Binary files a/web/www/routino/icons/marker-99-red.png and b/web/www/routino/icons/marker-99-red.png differ
diff --git a/web/www/routino/icons/marker-XXX-grey.png b/web/www/routino/icons/marker-XXX-grey.png
index d72ad9e..b88942a 100644
Binary files a/web/www/routino/icons/marker-XXX-grey.png and b/web/www/routino/icons/marker-XXX-grey.png differ
diff --git a/web/www/routino/icons/marker-XXX-red.png b/web/www/routino/icons/marker-XXX-red.png
index 74f9776..1333445 100644
Binary files a/web/www/routino/icons/marker-XXX-red.png and b/web/www/routino/icons/marker-XXX-red.png differ
diff --git a/web/www/routino/icons/marker-home-grey.png b/web/www/routino/icons/marker-home-grey.png
index 7a47134..248f497 100644
Binary files a/web/www/routino/icons/marker-home-grey.png and b/web/www/routino/icons/marker-home-grey.png differ
diff --git a/web/www/routino/icons/marker-home-red.png b/web/www/routino/icons/marker-home-red.png
index 41d0532..06134bf 100644
Binary files a/web/www/routino/icons/marker-home-red.png and b/web/www/routino/icons/marker-home-red.png differ
diff --git a/web/www/routino/mapprops.js b/web/www/routino/mapprops.js
index d2a19c9..1d13b3e 100644
--- a/web/www/routino/mapprops.js
+++ b/web/www/routino/mapprops.js
@@ -41,19 +41,6 @@ var mapprops={ // contains all properties for the map to be displayed.
tile_url: "http://www.openstreetmap.org/copyright",
tile_text: "© OpenStreetMap"
}
- },
- {
- label: "MapQuest",
- tiles: {
- url: "http://otile${s}.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.jpg",
- subdomains: ["1","2","3","4"]
- },
- attribution: {
- data_url: "http://www.openstreetmap.org/copyright",
- data_text: "© OpenStreetMap contributors",
- tile_url: "http://www.mapquest.com/",
- tile_text: "© MapQuest <img src=\"http://developer.mapquest.com/content/osm/mq_logo.png\">"
- }
}
],
diff --git a/web/www/routino/results.cgi b/web/www/routino/results.cgi
index bbd564d..fc61815 100755
--- a/web/www/routino/results.cgi
+++ b/web/www/routino/results.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2014 Andrew M. Bishop
+# This file Copyright 2008-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the generic router script
-require "router.pl";
+require "./router.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/web/www/routino/router.cgi b/web/www/routino/router.cgi
index f92a210..6a9f8c5 100755
--- a/web/www/routino/router.cgi
+++ b/web/www/routino/router.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2014 Andrew M. Bishop
+# This file Copyright 2008-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the generic router script
-require "router.pl";
+require "./router.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/web/www/routino/router.css b/web/www/routino/router.css
index 4feb364..41af1af 100644
--- a/web/www/routino/router.css
+++ b/web/www/routino/router.css
@@ -3,7 +3,7 @@
//
// Part of the Routino routing software.
//
-// This file Copyright 2008-2015 Andrew M. Bishop
+// This file Copyright 2008-2017 Andrew M. Bishop
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
@@ -58,7 +58,6 @@ DIV#tab_options_div DIV.waypoint SPAN
DIV#tab_options_div DIV.waypoint DIV.waypoint-buttons
{
- width: 76px;
float: right;
}
@@ -89,7 +88,6 @@ DIV#tab_options_div DIV#waypoints-buttons TABLE
DIV#tab_options_div DIV#waypoints-buttons DIV.waypoint-buttons
{
- width: 76px;
float: right;
text-align: center;
vertical-align: 50%;
@@ -129,7 +127,7 @@ DIV#tab_options_div A:hover
background: #F0F000;
}
-DIV#tab_options_div INPUT
+DIV#tab_options_div INPUT, DIV#tab_results_div INPUT
{
padding: 0;
border: 1px solid;
@@ -151,7 +149,7 @@ DIV#tab_options_div INPUT:hover
background: #F0F0C0;
}
-DIV#tab_options_div INPUT#shortest
+DIV#tab_options_div INPUT#shortest1, DIV#tab_results_div INPUT#shortest2
{
margin: 3px;
border: 3px solid;
@@ -163,19 +161,19 @@ DIV#tab_options_div INPUT#shortest
text-align: center;
}
-DIV#tab_options_div INPUT#shortest:hover
+DIV#tab_options_div INPUT#shortest1:hover, DIV#tab_results_div INPUT#shortest2:hover
{
background: #F0F000;
}
-DIV#tab_options_div INPUT[disabled]#shortest
+DIV#tab_options_div INPUT[disabled]#shortest1, DIV#tab_results_div INPUT[disabled]#shortest2
{
border-color: #004000;
background: #E0F0E0;
}
-DIV#tab_options_div INPUT#quickest
+DIV#tab_options_div INPUT#quickest1, DIV#tab_results_div INPUT#quickest2
{
margin: 3px;
border: 3px solid;
@@ -187,12 +185,12 @@ DIV#tab_options_div INPUT#quickest
text-align: center;
}
-DIV#tab_options_div INPUT#quickest:hover
+DIV#tab_options_div INPUT#quickest1:hover, DIV#tab_results_div INPUT#quickest2:hover
{
background: #F0F000;
}
-DIV#tab_options_div INPUT[disabled]#quickest
+DIV#tab_options_div INPUT[disabled]#quickest1, DIV#tab_results_div INPUT[disabled]#quickest2
{
border-color: #000040;
diff --git a/web/www/routino/router.html.de b/web/www/routino/router.html.de
index 5fd1502..835d066 100644
--- a/web/www/routino/router.html.de
+++ b/web/www/routino/router.html.de
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -105,7 +105,7 @@ Wähle Start- und Endpunkt (klicke auf die Marker-Symbole unten), wähle die Rou
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -122,7 +122,7 @@ Wähle Start- und Endpunkt (klicke auf die Marker-Symbole unten), wähle die Rou
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Wegpunkt XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Wegpunkt XXX geografische Länge" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Wegpunkt XXX geografische Länge" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Wegpunkt XXX geografische Breite" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -159,6 +159,12 @@ Wähle Start- und Endpunkt (klicke auf die Marker-Symbole unten), wähle die Rou
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Suche</span>
+<input type="button" title="Kürzeste Route finden" id="shortest1" value="kürzester Weg" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Schnellste Route finden" id="quickest1" value="schnellste Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Fortbewegungsart</span>
@@ -259,12 +265,6 @@ Wähle Start- und Endpunkt (klicke auf die Marker-Symbole unten), wähle die Rou
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Suche</span>
-<input type="button" title="Kürzeste Route finden" id="shortest" value="kürzester Weg" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Schnellste Route finden" id="quickest" value="schnellste Route" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Links</span>
<a id="permalink_url" href="router.html">anpassen dieser Kartenansicht</a>
<br>
@@ -357,6 +357,12 @@ Breite ist möglich. Genauso können Einbahnstraßenbeschräkungen ignoriert wer
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Suche</span>
+<input type="button" title="Kürzeste Route finden" id="shortest2" value="kürzester Weg" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Schnellste Route finden" id="quickest2" value="schnellste Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">kürzester Weg</span>
diff --git a/web/www/routino/router.html.en b/web/www/routino/router.html.en
index a2ad70d..c8a3a44 100644
--- a/web/www/routino/router.html.en
+++ b/web/www/routino/router.html.en
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -105,7 +105,7 @@ Select start and end points (click on the marker icons below), select routing pr
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -122,7 +122,7 @@ Select start and end points (click on the marker icons below), select routing pr
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Waypoint XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Waypoint XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -159,6 +159,12 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Find</span>
+<input type="button" title="Find shortest route" id="shortest1" value="Shortest Route" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Find quickest route" id="quickest1" value="Quickest Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Transport Type</span>
@@ -259,12 +265,6 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Find</span>
-<input type="button" title="Find shortest route" id="shortest" value="Shortest Route" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Find quickest route" id="quickest" value="Quickest Route" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Links</span>
<a id="permalink_url" href="router.html">Link to this map view</a>
<br>
@@ -364,6 +364,12 @@ one-way restrictions (e.g. if walking).
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Find</span>
+<input type="button" title="Find shortest route" id="shortest2" value="Shortest Route" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Find quickest route" id="quickest2" value="Quickest Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">Shortest Route</span>
diff --git a/web/www/routino/router.html.fr b/web/www/routino/router.html.fr
index f3c9cd7..985c59b 100644
--- a/web/www/routino/router.html.fr
+++ b/web/www/routino/router.html.fr
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -105,7 +105,7 @@ Sélectionner les points de départ et d'arrivée (cliquer sur les icones ci-des
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -122,7 +122,7 @@ Sélectionner les points de départ et d'arrivée (cliquer sur les icones ci-des
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Étape XXX de l'itinéraire" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Étape XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Étape XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Étape XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -159,6 +159,12 @@ Sélectionner les points de départ et d'arrivée (cliquer sur les icones ci-des
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Rechercher</span>
+<input type="button" title="Chercher l'itinéraire le plus court" id="shortest1" value="Itinéraire le plus court" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Chercher l'itinéraire le plus rapide" id="quickest1" value="Itinéraire le plus rapide" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Mode de déplacement</span>
@@ -259,12 +265,6 @@ Sélectionner les points de départ et d'arrivée (cliquer sur les icones ci-des
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Rechercher</span>
-<input type="button" title="Chercher l'itinéraire le plus court" id="shortest" value="Itinéraire le plus court" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Chercher l'itinéraire le plus rapide" id="quickest" value="Itinéraire le plus rapide" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Liens</span>
<a id="permalink_url" href="router.html">Lien vers cet outil de visualisation</a>
<br>
@@ -364,6 +364,12 @@ les restrictions de sens unique (e. pour la marche).
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Rechercher</span>
+<input type="button" title="Chercher l'itinéraire le plus court" id="shortest2" value="Itinéraire le plus court" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Chercher l'itinéraire le plus rapide" id="quickest2" value="Itinéraire le plus rapide" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">Itinéraire le plus court</span>
diff --git a/web/www/routino/router.html.hu b/web/www/routino/router.html.hu
index aa3ff0d..c5d9d74 100644
--- a/web/www/routino/router.html.hu
+++ b/web/www/routino/router.html.hu
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -105,7 +105,7 @@ Select start and end points (click on the marker icons below), select routing pr
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -122,7 +122,7 @@ Select start and end points (click on the marker icons below), select routing pr
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Waypoint XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Waypoint XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -159,6 +159,12 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Find</span>
+<input type="button" title="A legrövidebb út keresése" id="shortest1" value="Legrövidebb út" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="A leggyorsabb út keresése" id="quickest1" value="Leggyorsabb út" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Közlekedési mód</span>
@@ -259,12 +265,6 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Find</span>
-<input type="button" title="A legrövidebb út keresése" id="shortest" value="Legrövidebb út" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="A leggyorsabb út keresése" id="quickest" value="Leggyorsabb út" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Linkek</span>
<a id="permalink_url" href="router.html">Link erre a nézetre</a>
<br>
@@ -364,6 +364,12 @@ one-way restrictions (e.g. if walking).
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Find</span>
+<input type="button" title="A legrövidebb út keresése" id="shortest2" value="Legrövidebb út" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="A leggyorsabb út keresése" id="quickest2" value="Leggyorsabb út" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">Legrövidebb út</span>
diff --git a/web/www/routino/router.html.nl b/web/www/routino/router.html.nl
index 3b736f4..f72861a 100644
--- a/web/www/routino/router.html.nl
+++ b/web/www/routino/router.html.nl
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -106,7 +106,7 @@ icoon links, schuif het op map naar gewenste positie).
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -123,7 +123,7 @@ icoon links, schuif het op map naar gewenste positie).
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Waypoint XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Waypoint XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -160,6 +160,12 @@ icoon links, schuif het op map naar gewenste positie).
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Zoek Route</span>
+<input type="button" title="Zoek de kortste route" id="shortest1" value="Kortste Route" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Zoek de snelste route" id="quickest1" value="Snelste Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Transport Type</span>
@@ -260,12 +266,6 @@ icoon links, schuif het op map naar gewenste positie).
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Zoek Route</span>
-<input type="button" title="Zoek de kortste route" id="shortest" value="Kortste Route" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Zoek de snelste route" id="quickest" value="Snelste Route" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Links</span>
<a id="permalink_url" href="router.html">Link to this map view</a>
<br>
@@ -367,6 +367,12 @@ Het is ook mogelijk geen rekening te houden met eenrichtingsverkeer
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Zoek Route</span>
+<input type="button" title="Zoek de kortste route" id="shortest2" value="Kortste Route" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Zoek de snelste route" id="quickest2" value="Snelste Route" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">Kortste Route</span>
diff --git a/web/www/routino/router.html.pl b/web/www/routino/router.html.pl
index 13560d9..d8f3bc2 100644
--- a/web/www/routino/router.html.pl
+++ b/web/www/routino/router.html.pl
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -105,7 +105,7 @@ Select start and end points (click on the marker icons below), select routing pr
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" checked>
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" >
</table>
@@ -122,7 +122,7 @@ Select start and end points (click on the marker icons below), select routing pr
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Waypoint XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Waypoint XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
@@ -132,12 +132,12 @@ Select start and end points (click on the marker icons below), select routing pr
<img alt="?" src="icons/waypoint-search.png" title="Znajdź miejsce" onmousedown="markerSearch(XXX);" >
<img alt="G" src="icons/waypoint-locate.png" title="Pobierz aktualna lokalizację" onmousedown="markerLocate(XXX);" >
<img alt="O" src="icons/waypoint-recentre.png" title="Wycentruj mapę na tym punkcie" onmousedown="markerRecentre(XXX);">
-<img alt="^" src="icons/waypoint-up.png" title="Move this waypoint up" onmousedown="markerMoveUp(XXX);" >
-<img alt="+" src="icons/waypoint-add.png" title="Add waypoint after this one" onmousedown="markerAddAfter(XXX);">
+<img alt="^" src="icons/waypoint-up.png" title="Przenieś ten punkt wyżej" onmousedown="markerMoveUp(XXX);" >
+<img alt="+" src="icons/waypoint-add.png" title="Dodaj punkt po tym" onmousedown="markerAddAfter(XXX);">
<br>
-<img alt="#" src="icons/waypoint-coords.png" title="Coordinates for location" onmousedown="markerCoords(XXX);" >
+<img alt="#" src="icons/waypoint-coords.png" title="Współrzędne dla lokalizacji" onmousedown="markerCoords(XXX);" >
<img alt="~" src="icons/waypoint-home.png" title="Współrzędne lokalizacji" onmousedown="markerHome(XXX);" >
-<img alt="o" src="icons/waypoint-centre.png" title="Centre this waypoint on map" onmousedown="markerCentre(XXX);" >
+<img alt="o" src="icons/waypoint-centre.png" title="Wyśrodkuj ten punkt na mapie" onmousedown="markerCentre(XXX);" >
<img alt="v" src="icons/waypoint-down.png" title="Move this waypoint down" onmousedown="markerMoveDown(XXX);">
<img alt="-" src="icons/waypoint-remove.png" title="Remove this waypoint" onmousedown="markerRemove(XXX);" >
</div>
@@ -159,6 +159,12 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Znajdź</span>
+<input type="button" title="Znajdź najkrótsza trasę" id="shortest1" value="Najkrótsza trasa" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Znajdź najdłuższą trasę" id="quickest1" value="Najszybsza trasa" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Typ transportu</span>
@@ -172,7 +178,7 @@ Select start and end points (click on the marker icons below), select routing pr
<tr><td>Motocykl:<td><input name="transport" type="radio" value="motorcycle" onchange="formSetTransport('motorcycle');">
<tr><td>Samochód: <td><input name="transport" type="radio" value="motorcar" onchange="formSetTransport('motorcar' );">
<tr><td>Goods: <td><input name="transport" type="radio" value="goods" onchange="formSetTransport('goods' );">
-<tr><td>HGV: <td><input name="transport" type="radio" value="hgv" onchange="formSetTransport('hgv' );">
+<tr><td>Pojazd ciężarowy: <td><input name="transport" type="radio" value="hgv" onchange="formSetTransport('hgv' );">
<tr><td>Pojazd użyteczności publicznej: <td><input name="transport" type="radio" value="psv" onchange="formSetTransport('psv' );">
</table>
</div>
@@ -227,7 +233,7 @@ Select start and end points (click on the marker icons below), select routing pr
<div class="hideshow_box">
<span id="hideshow_property_show" onclick="hideshow_show('property');" class="hideshow_show">+</span>
<span id="hideshow_property_hide" onclick="hideshow_hide('property');" class="hideshow_hide">-</span>
-<span class="hideshow_title">Property Preferences</span>
+<span class="hideshow_title">Ustawienia zmiennych</span>
<div id="hideshow_property_div" style="display: none;">
<table>
<tr><td>Paved: <td><input name="property-paved" type="text" size="3" onchange="formSetProperty('paved' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('paved' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('paved' ,'+');">
@@ -259,12 +265,6 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Znajdź</span>
-<input type="button" title="Znajdź najkrótsza trasę" id="shortest" value="Najkrótsza trasa" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Znajdź najdłuższą trasę" id="quickest" value="Najszybsza trasa" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
<span class="hideshow_title">Połączenia</span>
<a id="permalink_url" href="router.html">Link to this map view</a>
<br>
@@ -364,6 +364,12 @@ one-way restrictions (e.g. if walking).
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Znajdź</span>
+<input type="button" title="Znajdź najkrótsza trasę" id="shortest2" value="Najkrótsza trasa" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Znajdź najdłuższą trasę" id="quickest2" value="Najszybsza trasa" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_shortest_show" onclick="hideshow_show('shortest');" class="hideshow_show">+</span>
<span id="hideshow_shortest_hide" onclick="hideshow_hide('shortest');" class="hideshow_hide">-</span>
<span class="hideshow_title">Najkrótsza trasa</span>
diff --git a/web/www/routino/router.html.ru b/web/www/routino/router.html.ru
index 4aae6e0..163689c 100644
--- a/web/www/routino/router.html.ru
+++ b/web/www/routino/router.html.ru
@@ -13,7 +13,7 @@ Routino router web page.
Part of the Routino routing software.
-This file Copyright 2008-2015 Andrew M. Bishop
+This file Copyright 2008-2017 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -54,9 +54,9 @@ along with this program. If not, see http://www.gnu.org/licenses/.
<div class="left_panel">
<div class="tab_box">
-<span id="tab_options" onclick="tab_select('options');" class="tab_selected" title="Задать настройки маршрутизации">Options</span>
-<span id="tab_results" onclick="tab_select('results');" class="tab_unselected" title="See routing results">Results</span>
-<span id="tab_data" onclick="tab_select('data');" class="tab_unselected" title="View database information">Data</span>
+<span id="tab_options" onclick="tab_select('options');" class="tab_selected" title="Задать настройки маршрутизации">Настройки</span>
+<span id="tab_results" onclick="tab_select('results');" class="tab_unselected" title="Смотрите результат прокладки маршрута">Результаты</span>
+<span id="tab_data" onclick="tab_select('data');" class="tab_unselected" title="View database information">Данные</span>
</div>
<div class="tab_content" id="tab_options_div">
@@ -67,7 +67,7 @@ along with this program. If not, see http://www.gnu.org/licenses/.
This web page allows routing within the data collected by OpenStreetMap.
Select start and end points (click on the marker icons below), select routing preferences then find a route.
<div class="center">
-<a target="other" href="http://www.routino.org/">Routino Website</a>
+<a target="other" href="http://www.routino.org/">Сайт Routino</a>
|
<a target="other" href="documentation/">Документация</a>
</div>
@@ -105,7 +105,7 @@ Select start and end points (click on the marker icons below), select routing pr
<td>(PL)
<td><input name="language" type="radio" value="pl" onchange="formSetLanguage();" >
<tr>
-<td><a id="lang_ru_url" href="router.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="router.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
<td><input name="language" type="radio" value="ru" onchange="formSetLanguage();" checked>
</table>
@@ -116,30 +116,30 @@ Select start and end points (click on the marker icons below), select routing pr
<div class="hideshow_box">
<span id="hideshow_waypoint_show" onclick="hideshow_show('waypoint');" class="hideshow_hide">+</span>
<span id="hideshow_waypoint_hide" onclick="hideshow_hide('waypoint');" class="hideshow_show">-</span>
-<span class="hideshow_title">Waypoints</span>
+<span class="hideshow_title">Точки</span>
<div id="hideshow_waypoint_div">
<div id="waypoints">
<div id="waypointXXX" class="waypoint" style="display: none;">
<img id="iconXXX" class="waypoint-icon" src="icons/marker-XXX-grey.png" title="Waypoint XXX Position" alt="Waypoint XXX" onmouseup="markerToggleMap(XXX);" draggable="true">
<span id="coordsXXX">
-<input name="lonXXX" type="text" size="7" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
+<input name="lonXXX" type="text" size="6" title="Waypoint XXX Longitude" onchange="formSetCoords(XXX);">E
<input name="latXXX" type="text" size="7" title="Waypoint XXX Latitude" onchange="formSetCoords(XXX);">N
</span>
<span id="searchXXX" style="display: none;">
<input name="searchXXX" type="text" size="18" title="Waypoint XXX Location"> <!-- uses Javascript event for triggering -->
</span>
<div class="waypoint-buttons" style="display: inline-block;">
-<img alt="?" src="icons/waypoint-search.png" title="Search for location" onmousedown="markerSearch(XXX);" >
-<img alt="G" src="icons/waypoint-locate.png" title="Get current location" onmousedown="markerLocate(XXX);" >
-<img alt="O" src="icons/waypoint-recentre.png" title="Centre map on this waypoint" onmousedown="markerRecentre(XXX);">
-<img alt="^" src="icons/waypoint-up.png" title="Move this waypoint up" onmousedown="markerMoveUp(XXX);" >
-<img alt="+" src="icons/waypoint-add.png" title="Add waypoint after this one" onmousedown="markerAddAfter(XXX);">
+<img alt="?" src="icons/waypoint-search.png" title="Поиск по адресу" onmousedown="markerSearch(XXX);" >
+<img alt="G" src="icons/waypoint-locate.png" title="Текущее местоположение" onmousedown="markerLocate(XXX);" >
+<img alt="O" src="icons/waypoint-recentre.png" title="Центрировать карту на этой точке" onmousedown="markerRecentre(XXX);">
+<img alt="^" src="icons/waypoint-up.png" title="Поместить точку выше" onmousedown="markerMoveUp(XXX);" >
+<img alt="+" src="icons/waypoint-add.png" title="Добавить следующую точку " onmousedown="markerAddAfter(XXX);">
<br>
-<img alt="#" src="icons/waypoint-coords.png" title="Coordinates for location" onmousedown="markerCoords(XXX);" >
-<img alt="~" src="icons/waypoint-home.png" title="Toggle as home location" onmousedown="markerHome(XXX);" >
-<img alt="o" src="icons/waypoint-centre.png" title="Centre this waypoint on map" onmousedown="markerCentre(XXX);" >
-<img alt="v" src="icons/waypoint-down.png" title="Move this waypoint down" onmousedown="markerMoveDown(XXX);">
-<img alt="-" src="icons/waypoint-remove.png" title="Remove this waypoint" onmousedown="markerRemove(XXX);" >
+<img alt="#" src="icons/waypoint-coords.png" title="По координатам" onmousedown="markerCoords(XXX);" >
+<img alt="~" src="icons/waypoint-home.png" title="Переключение домашней локации" onmousedown="markerHome(XXX);" >
+<img alt="o" src="icons/waypoint-centre.png" title="Переместить точку в центр карты" onmousedown="markerCentre(XXX);" >
+<img alt="v" src="icons/waypoint-down.png" title="Поместить точку ниже" onmousedown="markerMoveDown(XXX);">
+<img alt="-" src="icons/waypoint-remove.png" title="Удалить эту путевую точку" onmousedown="markerRemove(XXX);" >
</div>
<div id="searchresultsXXX" style="display: none;">
</div>
@@ -147,33 +147,39 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div id="waypoints-buttons">
<table>
-<tr><td>Close loop: <td><input type="checkbox" name="loop" onchange="formSetLoopReverse('loop' );">
-<tr><td>Reverse order:<td><input type="checkbox" name="reverse" onchange="formSetLoopReverse('reverse');">
+<tr><td>Зациклить: <td><input type="checkbox" name="loop" onchange="formSetLoopReverse('loop' );">
+<tr><td>Обратный порядок:<td><input type="checkbox" name="reverse" onchange="formSetLoopReverse('reverse');">
</table>
<div class="waypoint-buttons" style="display: inline-block;">
-<img src="icons/waypoint-loop.png" title="Add a new waypoint to make a loop" onmousedown="markersLoop();">
-<img src="icons/waypoint-reverse.png" title="Reverse order of waypoints" onmousedown="markersReverse();">
+<img src="icons/waypoint-loop.png" title="Добавить точку для зацикливания" onmousedown="markersLoop();">
+<img src="icons/waypoint-reverse.png" title="Перестроить в обратном порядке" onmousedown="markersReverse();">
</div>
</div>
</div>
</div>
<div class="hideshow_box">
+<span class="hideshow_title">Найти</span>
+<input type="button" title="Найти кратчайший маршрут" id="shortest1" value="Кратчайший маршрут" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Найти быстрейший маршут" id="quickest1" value="Быстрейший маршрут" onclick="findRoute('quickest');" disabled="disabled">
+</div>
+
+<div class="hideshow_box">
<span id="hideshow_transport_show" onclick="hideshow_show('transport');" class="hideshow_hide">+</span>
<span id="hideshow_transport_hide" onclick="hideshow_hide('transport');" class="hideshow_show">-</span>
<span class="hideshow_title">Тип транспорта</span>
<div id="hideshow_transport_div">
<table>
-<tr><td>Foot: <td><input name="transport" type="radio" value="foot" onchange="formSetTransport('foot' );">
+<tr><td>Пешком: <td><input name="transport" type="radio" value="foot" onchange="formSetTransport('foot' );">
<tr><td>Лошадь: <td><input name="transport" type="radio" value="horse" onchange="formSetTransport('horse' );">
<tr><td>Инвалидное кресло:<td><input name="transport" type="radio" value="wheelchair" onchange="formSetTransport('wheelchair');">
<tr><td>Велосипед: <td><input name="transport" type="radio" value="bicycle" onchange="formSetTransport('bicycle' );">
<tr><td>Мопед: <td><input name="transport" type="radio" value="moped" onchange="formSetTransport('moped' );">
<tr><td>Мотоцикл:<td><input name="transport" type="radio" value="motorcycle" onchange="formSetTransport('motorcycle');">
-<tr><td>Motorcar: <td><input name="transport" type="radio" value="motorcar" onchange="formSetTransport('motorcar' );">
-<tr><td>Товары: <td><input name="transport" type="radio" value="goods" onchange="formSetTransport('goods' );">
-<tr><td>HGV: <td><input name="transport" type="radio" value="hgv" onchange="formSetTransport('hgv' );">
-<tr><td>PSV: <td><input name="transport" type="radio" value="psv" onchange="formSetTransport('psv' );">
+<tr><td>Машина: <td><input name="transport" type="radio" value="motorcar" onchange="formSetTransport('motorcar' );">
+<tr><td>Фургон: <td><input name="transport" type="radio" value="goods" onchange="formSetTransport('goods' );">
+<tr><td>Грузовой автомобиль: <td><input name="transport" type="radio" value="hgv" onchange="formSetTransport('hgv' );">
+<tr><td>Автобус: <td><input name="transport" type="radio" value="psv" onchange="formSetTransport('psv' );">
</table>
</div>
</div>
@@ -181,22 +187,22 @@ Select start and end points (click on the marker icons below), select routing pr
<div class="hideshow_box">
<span id="hideshow_highway_show" onclick="hideshow_show('highway');" class="hideshow_show">+</span>
<span id="hideshow_highway_hide" onclick="hideshow_hide('highway');" class="hideshow_hide">-</span>
-<span class="hideshow_title">Highway Preferences</span>
+<span class="hideshow_title">Настройки типа дорог</span>
<div id="hideshow_highway_div" style="display: none;">
<table>
<tr><td>Автомагистраль: <td><input name="highway-motorway" type="text" size="3" onchange="formSetHighway('motorway' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('motorway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('motorway' ,'+');">
-<tr><td>Trunk: <td><input name="highway-trunk" type="text" size="3" onchange="formSetHighway('trunk' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('trunk' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('trunk' ,'+');">
-<tr><td>Primary: <td><input name="highway-primary" type="text" size="3" onchange="formSetHighway('primary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('primary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('primary' ,'+');">
-<tr><td>Secondary: <td><input name="highway-secondary" type="text" size="3" onchange="formSetHighway('secondary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('secondary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('secondary' ,'+');">
-<tr><td>Tertiary: <td><input name="highway-tertiary" type="text" size="3" onchange="formSetHighway('tertiary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('tertiary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('tertiary' ,'+');">
-<tr><td>Unclassified:<td><input name="highway-unclassified" type="text" size="3" onchange="formSetHighway('unclassified','=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('unclassified','-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('unclassified','+');">
-<tr><td>Residential: <td><input name="highway-residential" type="text" size="3" onchange="formSetHighway('residential' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('residential' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('residential' ,'+');">
-<tr><td>Service: <td><input name="highway-service" type="text" size="3" onchange="formSetHighway('service' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('service' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('service' ,'+');">
-<tr><td>Track: <td><input name="highway-track" type="text" size="3" onchange="formSetHighway('track' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('track' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('track' ,'+');">
-<tr><td>Cycleway: <td><input name="highway-cycleway" type="text" size="3" onchange="formSetHighway('cycleway' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('cycleway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('cycleway' ,'+');">
-<tr><td>Path: <td><input name="highway-path" type="text" size="3" onchange="formSetHighway('path' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('path' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('path' ,'+');">
-<tr><td>Steps: <td><input name="highway-steps" type="text" size="3" onchange="formSetHighway('steps' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('steps' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('steps' ,'+');">
-<tr><td>Ferry: <td><input name="highway-ferry" type="text" size="3" onchange="formSetHighway('ferry' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('ferry' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('ferry' ,'+');">
+<tr><td>Международная трасса: <td><input name="highway-trunk" type="text" size="3" onchange="formSetHighway('trunk' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('trunk' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('trunk' ,'+');">
+<tr><td>Дорога регионального значения: <td><input name="highway-primary" type="text" size="3" onchange="formSetHighway('primary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('primary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('primary' ,'+');">
+<tr><td>Дорога областного значения: <td><input name="highway-secondary" type="text" size="3" onchange="formSetHighway('secondary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('secondary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('secondary' ,'+');">
+<tr><td>Дорога районного значения: <td><input name="highway-tertiary" type="text" size="3" onchange="formSetHighway('tertiary' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('tertiary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('tertiary' ,'+');">
+<tr><td>Дорога местного значения:<td><input name="highway-unclassified" type="text" size="3" onchange="formSetHighway('unclassified','=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('unclassified','-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('unclassified','+');">
+<tr><td>Улица: <td><input name="highway-residential" type="text" size="3" onchange="formSetHighway('residential' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('residential' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('residential' ,'+');">
+<tr><td>Проезд: <td><input name="highway-service" type="text" size="3" onchange="formSetHighway('service' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('service' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('service' ,'+');">
+<tr><td>Дорога с/х назначения: <td><input name="highway-track" type="text" size="3" onchange="formSetHighway('track' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('track' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('track' ,'+');">
+<tr><td>Велодорожка: <td><input name="highway-cycleway" type="text" size="3" onchange="formSetHighway('cycleway' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('cycleway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('cycleway' ,'+');">
+<tr><td>Тропинка: <td><input name="highway-path" type="text" size="3" onchange="formSetHighway('path' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('path' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('path' ,'+');">
+<tr><td>Лестница: <td><input name="highway-steps" type="text" size="3" onchange="formSetHighway('steps' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('steps' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('steps' ,'+');">
+<tr><td>Паром: <td><input name="highway-ferry" type="text" size="3" onchange="formSetHighway('ferry' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetHighway('ferry' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetHighway('ferry' ,'+');">
</table>
</div>
</div>
@@ -208,18 +214,18 @@ Select start and end points (click on the marker icons below), select routing pr
<div id="hideshow_speed_div" style="display: none;">
<table>
<tr><td>Автомагистраль: <td><input name="speed-motorway" type="text" size="3" onchange="formSetSpeed('motorway' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('motorway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('motorway' ,'+');">
-<tr><td>Trunk: <td><input name="speed-trunk" type="text" size="3" onchange="formSetSpeed('trunk' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('trunk' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('trunk' ,'+');">
-<tr><td>Primary: <td><input name="speed-primary" type="text" size="3" onchange="formSetSpeed('primary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('primary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('primary' ,'+');">
-<tr><td>Secondary: <td><input name="speed-secondary" type="text" size="3" onchange="formSetSpeed('secondary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('secondary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('secondary' ,'+');">
-<tr><td>Tertiary: <td><input name="speed-tertiary" type="text" size="3" onchange="formSetSpeed('tertiary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('tertiary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('tertiary' ,'+');">
-<tr><td>Unclassified:<td><input name="speed-unclassified" type="text" size="3" onchange="formSetSpeed('unclassified','=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('unclassified','-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('unclassified','+');">
-<tr><td>Residential: <td><input name="speed-residential" type="text" size="3" onchange="formSetSpeed('residential' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('residential' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('residential' ,'+');">
-<tr><td>Service: <td><input name="speed-service" type="text" size="3" onchange="formSetSpeed('service' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('service' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('service' ,'+');">
-<tr><td>Track: <td><input name="speed-track" type="text" size="3" onchange="formSetSpeed('track' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('track' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('track' ,'+');">
-<tr><td>Cycleway: <td><input name="speed-cycleway" type="text" size="3" onchange="formSetSpeed('cycleway' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('cycleway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('cycleway' ,'+');">
-<tr><td>Path: <td><input name="speed-path" type="text" size="3" onchange="formSetSpeed('path' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('path' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('path' ,'+');">
-<tr><td>Steps: <td><input name="speed-steps" type="text" size="3" onchange="formSetSpeed('steps' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('steps' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('steps' ,'+');">
-<tr><td>Ferry: <td><input name="speed-ferry" type="text" size="3" onchange="formSetSpeed('ferry' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('ferry' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('ferry' ,'+');">
+<tr><td>Международная трасса: <td><input name="speed-trunk" type="text" size="3" onchange="formSetSpeed('trunk' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('trunk' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('trunk' ,'+');">
+<tr><td>Дорога регионального значения: <td><input name="speed-primary" type="text" size="3" onchange="formSetSpeed('primary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('primary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('primary' ,'+');">
+<tr><td>Дорога областного значения: <td><input name="speed-secondary" type="text" size="3" onchange="formSetSpeed('secondary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('secondary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('secondary' ,'+');">
+<tr><td>Дорога районного значения: <td><input name="speed-tertiary" type="text" size="3" onchange="formSetSpeed('tertiary' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('tertiary' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('tertiary' ,'+');">
+<tr><td>Дорога местного значения:<td><input name="speed-unclassified" type="text" size="3" onchange="formSetSpeed('unclassified','=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('unclassified','-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('unclassified','+');">
+<tr><td>Улица: <td><input name="speed-residential" type="text" size="3" onchange="formSetSpeed('residential' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('residential' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('residential' ,'+');">
+<tr><td>Проезд: <td><input name="speed-service" type="text" size="3" onchange="formSetSpeed('service' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('service' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('service' ,'+');">
+<tr><td>Дорога с/х назначения: <td><input name="speed-track" type="text" size="3" onchange="formSetSpeed('track' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('track' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('track' ,'+');">
+<tr><td>Велодорожка: <td><input name="speed-cycleway" type="text" size="3" onchange="formSetSpeed('cycleway' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('cycleway' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('cycleway' ,'+');">
+<tr><td>Тропинка: <td><input name="speed-path" type="text" size="3" onchange="formSetSpeed('path' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('path' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('path' ,'+');">
+<tr><td>Лестница: <td><input name="speed-steps" type="text" size="3" onchange="formSetSpeed('steps' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('steps' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('steps' ,'+');">
+<tr><td>Паром: <td><input name="speed-ferry" type="text" size="3" onchange="formSetSpeed('ferry' ,'=');"><td>km/hr<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetSpeed('ferry' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetSpeed('ferry' ,'+');">
</table>
</div>
</div>
@@ -227,11 +233,11 @@ Select start and end points (click on the marker icons below), select routing pr
<div class="hideshow_box">
<span id="hideshow_property_show" onclick="hideshow_show('property');" class="hideshow_show">+</span>
<span id="hideshow_property_hide" onclick="hideshow_hide('property');" class="hideshow_hide">-</span>
-<span class="hideshow_title">Property Preferences</span>
+<span class="hideshow_title">Настройки качества дорог</span>
<div id="hideshow_property_div" style="display: none;">
<table>
-<tr><td>Paved: <td><input name="property-paved" type="text" size="3" onchange="formSetProperty('paved' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('paved' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('paved' ,'+');">
-<tr><td>Multiple Lanes: <td><input name="property-multilane" type="text" size="3" onchange="formSetProperty('multilane' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('multilane' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('multilane' ,'+');">
+<tr><td>Мощеная: <td><input name="property-paved" type="text" size="3" onchange="formSetProperty('paved' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('paved' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('paved' ,'+');">
+<tr><td>Многополосная: <td><input name="property-multilane" type="text" size="3" onchange="formSetProperty('multilane' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('multilane' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('multilane' ,'+');">
<tr><td>Мост: <td><input name="property-bridge" type="text" size="3" onchange="formSetProperty('bridge' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('bridge' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('bridge' ,'+');">
<tr><td>Туннель: <td><input name="property-tunnel" type="text" size="3" onchange="formSetProperty('tunnel' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('tunnel' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('tunnel' ,'+');">
<tr><td>Пеший маршрут:<td><input name="property-footroute" type="text" size="3" onchange="formSetProperty('footroute' ,'=');"><td>%<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetProperty('footroute' ,'-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetProperty('footroute' ,'+');">
@@ -247,7 +253,7 @@ Select start and end points (click on the marker icons below), select routing pr
<div id="hideshow_restriction_div" style="display: none;">
<table>
<tr><td>Односторонняя улица:<td><input name="restrict-oneway" type="checkbox" onchange="formSetRestriction('oneway');">
-<tr><td>Obey turn restrictions: <td><input name="restrict-turns" type="checkbox" onchange="formSetRestriction('turns' );">
+<tr><td>Ограничения поворота: <td><input name="restrict-turns" type="checkbox" onchange="formSetRestriction('turns' );">
</table>
<table>
<tr><td>Вес:<td><input name="restrict-weight" type="text" size="3" onchange="formSetRestriction('weight','=');"><td>tonnes<td><img alt="<" src="icons/waypoint-left.png" title="-" onmousedown="formSetRestriction('weight','-');">–/+<img alt=">" src="icons/waypoint-right.png" title="+" onmousedown="formSetRestriction('weight','+');">
@@ -259,16 +265,10 @@ Select start and end points (click on the marker icons below), select routing pr
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Find</span>
-<input type="button" title="Найти кратчайший маршрут" id="shortest" value="Кратчайший маршрут" onclick="findRoute('shortest');" disabled="disabled">
-<input type="button" title="Найти быстрейший маршут" id="quickest" value="Быстрейший маршрут" onclick="findRoute('quickest');" disabled="disabled">
-</div>
-
-<div class="hideshow_box">
-<span class="hideshow_title">Links</span>
+<span class="hideshow_title">Ссылки</span>
<a id="permalink_url" href="router.html">Link to this map view</a>
<br>
-<a id="edit_url" target="edit" style="display: none;">Edit this OSM data</a>
+<a id="edit_url" target="edit" style="display: none;">Редактировать данные OSM</a>
</div>
<div class="hideshow_box">
@@ -342,25 +342,31 @@ one-way restrictions (e.g. if walking).
<span class="hideshow_title">Статус</span>
<div id="result_status">
<div id="result_status_not_run">
-<b><i>Router not run</i></b>
+<b><i>Роутер не запущен</i></b>
</div>
<div id="result_status_running" style="display: none;">
-<b>Router running...</b>
+<b>Прокладка маршрута...</b>
</div>
<div id="result_status_complete" style="display: none;">
-<b>Routing completed</b>
+<b>Прокладка маршрута завершена</b>
<br>
-<a id="router_log_complete" target="router_log" href="#">View Details</a>
+<a id="router_log_complete" target="router_log" href="#">Подробнее</a>
</div>
<div id="result_status_error" style="display: none;">
-<b>Router error</b>
+<b>Ошибка прокладки маршрута</b>
<br>
-<a id="router_log_error" target="router_log" href="#">View Details</a>
+<a id="router_log_error" target="router_log" href="#">Подробнее</a>
</div>
<div id="result_status_failed" style="display: none;">
-<b>Router failed to run</b>
+<b>Ошибка при запуске</b>
+</div>
</div>
</div>
+
+<div class="hideshow_box">
+<span class="hideshow_title">Найти</span>
+<input type="button" title="Найти кратчайший маршрут" id="shortest2" value="Кратчайший маршрут" onclick="findRoute('shortest');" disabled="disabled">
+<input type="button" title="Найти быстрейший маршут" id="quickest2" value="Быстрейший маршрут" onclick="findRoute('quickest');" disabled="disabled">
</div>
<div class="hideshow_box">
@@ -369,7 +375,7 @@ one-way restrictions (e.g. if walking).
<span class="hideshow_title">Кратчайший маршрут</span>
<div id="shortest_status">
<div id="shortest_status_no_info">
-<b><i>No Information</i></b>
+<b><i>Пусто</i></b>
</div>
<div id="shortest_status_info" style="display: none;">
</div>
@@ -377,11 +383,11 @@ one-way restrictions (e.g. if walking).
<div id="hideshow_shortest_div" style="display: none;">
<div id="shortest_links" style="display: none;">
<table>
-<tr><td>HTML directions: <td><a id="shortest_html" target="shortest_html" href="#">Open Popup</a>
-<tr><td>GPX track file: <td><a id="shortest_gpx_track" target="shortest_gpx_track" href="#">Open Popup</a>
-<tr><td>GPX route file: <td><a id="shortest_gpx_route" target="shortest_gpx_route" href="#">Open Popup</a>
-<tr><td>Full text file: <td><a id="shortest_text_all" target="shortest_text_all" href="#">Open Popup</a>
-<tr><td>Text file: <td><a id="shortest_text" target="shortest_text" href="#">Open Popup</a>
+<tr><td>HTML навигатор: <td><a id="shortest_html" target="shortest_html" href="#">Открыть</a>
+<tr><td>Трек в формате GPX: <td><a id="shortest_gpx_track" target="shortest_gpx_track" href="#">Открыть</a>
+<tr><td>Маршрут в формате GPX: <td><a id="shortest_gpx_route" target="shortest_gpx_route" href="#">Открыть</a>
+<tr><td>Подробный текстовый файл: <td><a id="shortest_text_all" target="shortest_text_all" href="#">Открыть</a>
+<tr><td>Текстовый файл: <td><a id="shortest_text" target="shortest_text" href="#">Открыть</a>
</table>
<hr>
</div>
@@ -396,7 +402,7 @@ one-way restrictions (e.g. if walking).
<span class="hideshow_title">Быстрейший маршрут</span>
<div id="quickest_status">
<div id="quickest_status_no_info">
-<b><i>No Information</i></b>
+<b><i>Пусто</i></b>
</div>
<div id="quickest_status_info" style="display: none;">
</div>
@@ -404,11 +410,11 @@ one-way restrictions (e.g. if walking).
<div id="hideshow_quickest_div" style="display: none;">
<div id="quickest_links" style="display: none;">
<table>
-<tr><td>HTML directions: <td><a id="quickest_html" target="quickest_html" href="#">Open Popup</a>
-<tr><td>GPX track file: <td><a id="quickest_gpx_track" target="quickest_gpx_track" href="#">Open Popup</a>
-<tr><td>GPX route file: <td><a id="quickest_gpx_route" target="quickest_gpx_route" href="#">Open Popup</a>
-<tr><td>Full text file: <td><a id="quickest_text_all" target="quickest_text_all" href="#">Open Popup</a>
-<tr><td>Text file: <td><a id="quickest_text" target="quickest_text" href="#">Open Popup</a>
+<tr><td>HTML навигатор: <td><a id="quickest_html" target="quickest_html" href="#">Открыть</a>
+<tr><td>Трек в формате GPX: <td><a id="quickest_gpx_track" target="quickest_gpx_track" href="#">Открыть</a>
+<tr><td>Маршрут в формате GPX: <td><a id="quickest_gpx_route" target="quickest_gpx_route" href="#">Открыть</a>
+<tr><td>Подробный текстовый файл: <td><a id="quickest_text_all" target="quickest_text_all" href="#">Открыть</a>
+<tr><td>Текстовый файл: <td><a id="quickest_text" target="quickest_text" href="#">Открыть</a>
</table>
<hr>
</div>
@@ -463,9 +469,9 @@ route.
<div class="tab_content" id="tab_data_div" style="display: none;">
<div class="hideshow_box">
-<span class="hideshow_title">Routino Statistics</span>
+<span class="hideshow_title">Routino Статистика</span>
<div id="statistics_data"></div>
-<a id="statistics_link" href="statistics.cgi" onclick="displayStatistics();return(false);">Display data statistics</a>
+<a id="statistics_link" href="statistics.cgi" onclick="displayStatistics();return(false);">Показать статистику данных</a>
</div>
<div class="hideshow_box">
@@ -485,13 +491,13 @@ displaying of the underlying data in various ways.
<div class="map" id="map">
<noscript>
<p>
-Javascript is <em>required</em> to use this web page because of the interactive map.
+Javascript <em>обязателен</em> для просмотра данной страницы, так как на ней используется интерактивная карта.
</noscript>
</div>
<div class="attribution">
Router: <a href="http://www.routino.org/" target="routino">Routino</a>
|
-Geo Data: <span id="attribution_data"></span>
+Гео данные: <span id="attribution_data"></span>
|
Тайлы: <span id="attribution_tile"></span>
</div>
diff --git a/web/www/routino/router.leaflet.js b/web/www/routino/router.leaflet.js
index ceb2d7c..9f7fb27 100644
--- a/web/www/routino/router.leaflet.js
+++ b/web/www/routino/router.leaflet.js
@@ -3,7 +3,7 @@
//
// Part of the Routino routing software.
//
-// This file Copyright 2008-2015 Andrew M. Bishop
+// This file Copyright 2008-2016 Andrew M. Bishop
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
@@ -247,6 +247,8 @@ function form_init() // called from router.html
if(args["language"] !== undefined)
formSetLanguage(args["language"]);
+ else
+ formSetLanguage();
for(var key in routino.profile_highway)
if(args["highway-" + key] !== undefined)
@@ -1382,13 +1384,17 @@ function updateSearchButtons()
if(markersactive<2)
{
- document.getElementById("shortest").disabled="disabled";
- document.getElementById("quickest").disabled="disabled";
+ document.getElementById("shortest1").disabled="disabled";
+ document.getElementById("quickest1").disabled="disabled";
+ document.getElementById("shortest2").disabled="disabled";
+ document.getElementById("quickest2").disabled="disabled";
}
else
{
- document.getElementById("shortest").disabled="";
- document.getElementById("quickest").disabled="";
+ document.getElementById("shortest1").disabled="";
+ document.getElementById("quickest1").disabled="";
+ document.getElementById("shortest2").disabled="";
+ document.getElementById("quickest2").disabled="";
}
}
diff --git a/web/www/routino/router.openlayers.js b/web/www/routino/router.openlayers.js
index d951f1e..20b1c96 100644
--- a/web/www/routino/router.openlayers.js
+++ b/web/www/routino/router.openlayers.js
@@ -3,7 +3,7 @@
//
// Part of the Routino routing software.
//
-// This file Copyright 2008-2015 Andrew M. Bishop
+// This file Copyright 2008-2016 Andrew M. Bishop
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
@@ -247,6 +247,8 @@ function form_init() // called from router.html
if(args["language"] !== undefined)
formSetLanguage(args["language"]);
+ else
+ formSetLanguage();
for(var key in routino.profile_highway)
if(args["highway-" + key] !== undefined)
@@ -1452,13 +1454,17 @@ function updateSearchButtons()
if(markersactive<2)
{
- document.getElementById("shortest").disabled="disabled";
- document.getElementById("quickest").disabled="disabled";
+ document.getElementById("shortest1").disabled="disabled";
+ document.getElementById("quickest1").disabled="disabled";
+ document.getElementById("shortest2").disabled="disabled";
+ document.getElementById("quickest2").disabled="disabled";
}
else
{
- document.getElementById("shortest").disabled="";
- document.getElementById("quickest").disabled="";
+ document.getElementById("shortest1").disabled="";
+ document.getElementById("quickest1").disabled="";
+ document.getElementById("shortest2").disabled="";
+ document.getElementById("quickest2").disabled="";
}
}
diff --git a/web/www/routino/router.pl b/web/www/routino/router.pl
index cda0ab4..2ecfb9a 100644
--- a/web/www/routino/router.pl
+++ b/web/www/routino/router.pl
@@ -3,7 +3,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2015 Andrew M. Bishop
+# This file Copyright 2008-2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -22,10 +22,10 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# Load the profiles variables
-require "profiles.pl";
+require "./profiles.pl";
# Use the perl Time::HiRes module
use Time::HiRes qw(gettimeofday tv_interval);
diff --git a/web/www/routino/search.cgi b/web/www/routino/search.cgi
index 95b40c1..6a0ce3d 100755
--- a/web/www/routino/search.cgi
+++ b/web/www/routino/search.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2012-2014 Andrew M. Bishop
+# This file Copyright 2012-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the generic search script
-require "search.pl";
+require "./search.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/web/www/routino/search.pl b/web/www/routino/search.pl
index 1f4dbb4..713c712 100644
--- a/web/www/routino/search.pl
+++ b/web/www/routino/search.pl
@@ -3,7 +3,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2012-2014 Andrew M. Bishop
+# This file Copyright 2012-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -22,7 +22,7 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# Use the perl encoding/decoding functions
use Encode qw(decode encode);
diff --git a/web/www/routino/statistics.cgi b/web/www/routino/statistics.cgi
index 991adee..f7dead6 100755
--- a/web/www/routino/statistics.cgi
+++ b/web/www/routino/statistics.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2014 Andrew M. Bishop
+# This file Copyright 2008-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/web/www/routino/update-profiles.pl b/web/www/routino/update-profiles.pl
index 48e06d3..b98b2ad 100755
--- a/web/www/routino/update-profiles.pl
+++ b/web/www/routino/update-profiles.pl
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2011-2014 Andrew M. Bishop
+# This file Copyright 2011-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# The parameters for the execution
diff --git a/web/www/routino/visualiser.cgi b/web/www/routino/visualiser.cgi
index d287947..f0285a9 100755
--- a/web/www/routino/visualiser.cgi
+++ b/web/www/routino/visualiser.cgi
@@ -4,7 +4,7 @@
#
# Part of the Routino routing software.
#
-# This file Copyright 2008-2014 Andrew M. Bishop
+# This file Copyright 2008-2014, 2016 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,7 @@
use strict;
# Use the directory paths script
-require "paths.pl";
+require "./paths.pl";
# Use the perl CGI module
use CGI ':cgi';
diff --git a/web/www/routino/visualiser.html.de b/web/www/routino/visualiser.html.de
index b82b0ca..4e88620 100644
--- a/web/www/routino/visualiser.html.de
+++ b/web/www/routino/visualiser.html.de
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
@@ -107,8 +107,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<div class="hideshow_box">
<span class="hideshow_title">Anweisungen</span>
-Zoom in and then use the buttons below to download the data. The
-server will only return data if the selected area is small enough.
+Zoomen Sie in die Karte und nutzen Sie den Knöpfe unten um die Daten herunter zu laden. Der Server liefert nur ein Ergebnis, wenn das ausgewählte Feld klein genug ist.
</div>
<div class="hideshow_box">
@@ -189,15 +188,14 @@ algorithm page for description).
<div class="hideshow_box">
<span id="hideshow_waytype_show" onclick="hideshow_show('waytype');" class="hideshow_show">+</span>
<span id="hideshow_waytype_hide" onclick="hideshow_hide('waytype');" class="hideshow_hide">-</span>
-<input type="button" id="waytype" onclick="displayData('waytype');" value="Display Way Type Segments">
+<input type="button" id="waytype" onclick="displayData('waytype');" value="Wegart des Abschnittes anzeigen">
<div id="hideshow_waytype_div" style="display: none;">
-Each highway segment of special types (one-way, cycle-both-ways and roundabout) are
-shown. For one-way segments a coloured triangle indicates the allowed direction.
-The colours of the triangles depend on the bearing of the highway segment.
+Spezial-Arten der Abschnitte (Einbahnstraße, beidseitige Fahrradwege und Kreisverkehre) werden angezeigt.
+Ein koloriertes Dreieck zeigt die erlaubte Fahrtrichtung an. Die Farben der Dreiecke hängen von der jeweiligen Art des Abschnittes ab.
<form name="waytypes" id="waytypes" action="#" method="get" onsubmit="return false;">
<table>
<tr><td>Einbahnstraßen Segmente: <td><input name="waytype" type="radio" value="oneway" onchange="displayData('waytype');" checked>
-<tr><td>Cycle-both-way segments:<td><input name="waytype" type="radio" value="cyclebothways" onchange="displayData('waytype');">
+<tr><td>Fahrradweg auf beiden Seiten des Abschnittes:<td><input name="waytype" type="radio" value="cyclebothways" onchange="displayData('waytype');">
<tr><td>Kreisverkehr Segmente: <td><input name="waytype" type="radio" value="roundabout" onchange="displayData('waytype');">
</table>
</form>
@@ -207,9 +205,9 @@ The colours of the triangles depend on the bearing of the highway segment.
<div class="hideshow_box">
<span id="hideshow_highway_show" onclick="hideshow_show('highway');" class="hideshow_show">+</span>
<span id="hideshow_highway_hide" onclick="hideshow_hide('highway');" class="hideshow_hide">-</span>
-<input type="button" id="highway" onclick="displayData('highway');" value="Display Highway Segments">
+<input type="button" id="highway" onclick="displayData('highway');" value="Wegabschnitte anzeigen">
<div id="hideshow_highway_div" style="display: none;">
-Each segment of the chosen type of highway is drawn.
+Jeder Abschnitt der ausgewählten Wegart ist gezeichnet.
<form name="highways" id="highways" action="#" method="get" onsubmit="return false;">
<table>
<tr><td>Autobahn: <td><input name="highway" type="radio" value="motorway" onchange="displayData('highway');">
@@ -368,7 +366,7 @@ along with the length limit on relevant segments.
<div class="hideshow_box">
<span id="hideshow_property_show" onclick="hideshow_show('property');" class="hideshow_show">+</span>
<span id="hideshow_property_hide" onclick="hideshow_hide('property');" class="hideshow_hide">-</span>
-<input type="button" id="property" onclick="displayData('property');" value="Display Highway Properties">
+<input type="button" id="property" onclick="displayData('property');" value="Anzeigen der Wegeigenschaften">
<div id="hideshow_property_div" style="display: none;">
Each segment of the highways with a particular property is drawn.
<form name="properties" id="properties" action="#" method="get" onsubmit="return false;">
diff --git a/web/www/routino/visualiser.html.en b/web/www/routino/visualiser.html.en
index a37cf1e..51b3886 100644
--- a/web/www/routino/visualiser.html.en
+++ b/web/www/routino/visualiser.html.en
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
diff --git a/web/www/routino/visualiser.html.fr b/web/www/routino/visualiser.html.fr
index 5ea044e..d5c10e0 100644
--- a/web/www/routino/visualiser.html.fr
+++ b/web/www/routino/visualiser.html.fr
@@ -6,7 +6,7 @@
<meta name="keywords" content="openstreetmap routino verifier">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no">
-<title>Routino : Data Visualiser for Routing Data</title>
+<title>Routino : Afficheur d'itinéraire</title>
<!--
Routino data visualiser web page.
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
@@ -115,30 +115,30 @@ server will only return data if the selected area is small enough.
<span class="hideshow_title">État</span>
<div id="result_status">
<div id="result_status_no_data">
-<b><i>No data displayed</i></b>
+<b><i>Aucune donnée affichée</i></b>
</div>
<div id="result_status_data" style="display: none;">
</div>
<div id="result_status_failed" style="display: none;">
-<b>Failed to get visualiser data!</b>
+<b>Échec de récupération des données d'affichage!</b>
</div>
<div id="result_status_junctions" style="display: none;">
-<b>Processed # junctions</b>
+<b># intersections traitées</b>
</div>
<div id="result_status_super" style="display: none;">
-<b>Processed # super-nodes/segments</b>
+<b># segments/super-nœuds traités</b>
</div>
<div id="result_status_waytype" style="display: none;">
-<b>Processed # way type segments</b>
+<b># segments de type "way" traités</b>
</div>
<div id="result_status_highway" style="display: none;">
-<b>Processed # segments</b>
+<b># segments traités</b>
</div>
<div id="result_status_transport" style="display: none;">
-<b>Processed # segments</b>
+<b># segments traités</b>
</div>
<div id="result_status_barrier" style="display: none;">
-<b>Processed # nodes</b>
+<b># nœuds traités</b>
</div>
<div id="result_status_turns" style="display: none;">
<b>Processed # turn restrictions</b>
@@ -147,10 +147,10 @@ server will only return data if the selected area is small enough.
<b>Processed # limit changes</b>
</div>
<div id="result_status_property" style="display: none;">
-<b>Processed # segments</b>
+<b># segments traités</b>
</div>
<div id="result_status_errorlogs" style="display: none;">
-<b>Processed # error logs</b>
+<b># erreurs de log traitées</b>
</div>
</div>
</div>
@@ -158,7 +158,7 @@ server will only return data if the selected area is small enough.
<div class="hideshow_box">
<span id="hideshow_junctions_show" onclick="hideshow_show('junctions');" class="hideshow_show">+</span>
<span id="hideshow_junctions_hide" onclick="hideshow_hide('junctions');" class="hideshow_hide">-</span>
-<input type="button" id="junctions" onclick="displayData('junctions');" value="Display Junctions">
+<input type="button" id="junctions" onclick="displayData('junctions');" value="Afficher les intersections">
<div id="hideshow_junctions_div" style="display: none;">
Each node that is a dead-end, a junction of two highways of different
types (or different properties) or a junction where more than two segments
@@ -430,7 +430,7 @@ again.
<div class="tab_content" id="tab_router_div" style="display: none;">
<div class="hideshow_box">
-<span class="hideshow_title">Routino Router</span>
+<span class="hideshow_title">Planificateur de Routino</span>
To perform routing on the map use the link below.
<br>
<a id="router_url" href="router.html" target="router">Lien vers cet outil de visualisation</a>
diff --git a/web/www/routino/visualiser.html.hu b/web/www/routino/visualiser.html.hu
index f35fbd3..320cd8b 100644
--- a/web/www/routino/visualiser.html.hu
+++ b/web/www/routino/visualiser.html.hu
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
diff --git a/web/www/routino/visualiser.html.nl b/web/www/routino/visualiser.html.nl
index f6f6002..6c5124c 100644
--- a/web/www/routino/visualiser.html.nl
+++ b/web/www/routino/visualiser.html.nl
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
diff --git a/web/www/routino/visualiser.html.pl b/web/www/routino/visualiser.html.pl
index 25c1717..ba2e6f4 100644
--- a/web/www/routino/visualiser.html.pl
+++ b/web/www/routino/visualiser.html.pl
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
@@ -246,7 +246,7 @@ Each segment allowed for the chosen type of transport is drawn.
<tr><td>Motocykl:<td><input name="transport" type="radio" value="motorcycle" onchange="displayData('transport');">
<tr><td>Samochód: <td><input name="transport" type="radio" value="motorcar" onchange="displayData('transport');" checked>
<tr><td>Goods: <td><input name="transport" type="radio" value="goods" onchange="displayData('transport');">
-<tr><td>HGV: <td><input name="transport" type="radio" value="hgv" onchange="displayData('transport');">
+<tr><td>Pojazd ciężarowy: <td><input name="transport" type="radio" value="hgv" onchange="displayData('transport');">
<tr><td>Pojazd użyteczności publicznej: <td><input name="transport" type="radio" value="psv" onchange="displayData('transport');">
</table>
</form>
@@ -269,7 +269,7 @@ Each barrier blocking the chosen type of transport is drawn.
<tr><td>Motocykl:<td><input name="barrier" type="radio" value="motorcycle" onchange="displayData('barrier');">
<tr><td>Samochód: <td><input name="barrier" type="radio" value="motorcar" onchange="displayData('barrier');" checked>
<tr><td>Goods: <td><input name="barrier" type="radio" value="goods" onchange="displayData('barrier');">
-<tr><td>HGV: <td><input name="barrier" type="radio" value="hgv" onchange="displayData('barrier');">
+<tr><td>Pojazd ciężarowy: <td><input name="barrier" type="radio" value="hgv" onchange="displayData('barrier');">
<tr><td>Pojazd użyteczności publicznej: <td><input name="barrier" type="radio" value="psv" onchange="displayData('barrier');">
</table>
</form>
diff --git a/web/www/routino/visualiser.html.ru b/web/www/routino/visualiser.html.ru
index 7970284..ed3b1c8 100644
--- a/web/www/routino/visualiser.html.ru
+++ b/web/www/routino/visualiser.html.ru
@@ -66,7 +66,7 @@ along with this program. If not, see http://www.gnu.org/licenses/.
This web page allows visualisation of the data that Routino uses for routing.
Only data relevant for routing is displayed and some will therefore be excluded.
<div class="center">
-<a target="other" href="http://www.routino.org/">Routino Website</a>
+<a target="other" href="http://www.routino.org/">Сайт Routino</a>
|
<a target="other" href="documentation/">Документация</a>
</div>
@@ -98,7 +98,7 @@ Only data relevant for routing is displayed and some will therefore be excluded.
<td><a id="lang_pl_url" href="visualiser.html.pl" title="Polski webpage">Polski</a>
<td>(PL)
<tr>
-<td><a id="lang_ru_url" href="visualiser.html.ru" title="Русский">Русский</a>
+<td><a id="lang_ru_url" href="visualiser.html.ru" title="Страница на Русском языке">Русский</a>
<td>(RU)
</table>
<a target="translation" href="http://www.routino.org/translations/">Routino Translations</a>
@@ -196,7 +196,7 @@ shown. For one-way segments a coloured triangle indicates the allowed direction.
The colours of the triangles depend on the bearing of the highway segment.
<form name="waytypes" id="waytypes" action="#" method="get" onsubmit="return false;">
<table>
-<tr><td>One-way segments: <td><input name="waytype" type="radio" value="oneway" onchange="displayData('waytype');" checked>
+<tr><td>сегмент односторонней дороги: <td><input name="waytype" type="radio" value="oneway" onchange="displayData('waytype');" checked>
<tr><td>Cycle-both-way segments:<td><input name="waytype" type="radio" value="cyclebothways" onchange="displayData('waytype');">
<tr><td>Roundabout segments: <td><input name="waytype" type="radio" value="roundabout" onchange="displayData('waytype');">
</table>
@@ -213,18 +213,18 @@ Each segment of the chosen type of highway is drawn.
<form name="highways" id="highways" action="#" method="get" onsubmit="return false;">
<table>
<tr><td>Автомагистраль: <td><input name="highway" type="radio" value="motorway" onchange="displayData('highway');">
-<tr><td>Trunk: <td><input name="highway" type="radio" value="trunk" onchange="displayData('highway');">
-<tr><td>Primary: <td><input name="highway" type="radio" value="primary" onchange="displayData('highway');" checked>
-<tr><td>Secondary: <td><input name="highway" type="radio" value="secondary" onchange="displayData('highway');">
-<tr><td>Tertiary: <td><input name="highway" type="radio" value="tertiary" onchange="displayData('highway');">
-<tr><td>Unclassified:<td><input name="highway" type="radio" value="unclassified" onchange="displayData('highway');">
-<tr><td>Residential: <td><input name="highway" type="radio" value="residential" onchange="displayData('highway');">
-<tr><td>Service: <td><input name="highway" type="radio" value="service" onchange="displayData('highway');">
-<tr><td>Track: <td><input name="highway" type="radio" value="track" onchange="displayData('highway');">
-<tr><td>Cycleway: <td><input name="highway" type="radio" value="cycleway" onchange="displayData('highway');">
-<tr><td>Path: <td><input name="highway" type="radio" value="path" onchange="displayData('highway');">
-<tr><td>Steps: <td><input name="highway" type="radio" value="steps" onchange="displayData('highway');">
-<tr><td>Ferry: <td><input name="highway" type="radio" value="ferry" onchange="displayData('highway');">
+<tr><td>Международная трасса: <td><input name="highway" type="radio" value="trunk" onchange="displayData('highway');">
+<tr><td>Дорога регионального значения: <td><input name="highway" type="radio" value="primary" onchange="displayData('highway');" checked>
+<tr><td>Дорога областного значения: <td><input name="highway" type="radio" value="secondary" onchange="displayData('highway');">
+<tr><td>Дорога районного значения: <td><input name="highway" type="radio" value="tertiary" onchange="displayData('highway');">
+<tr><td>Дорога местного значения:<td><input name="highway" type="radio" value="unclassified" onchange="displayData('highway');">
+<tr><td>Улица: <td><input name="highway" type="radio" value="residential" onchange="displayData('highway');">
+<tr><td>Проезд: <td><input name="highway" type="radio" value="service" onchange="displayData('highway');">
+<tr><td>Дорога с/х назначения: <td><input name="highway" type="radio" value="track" onchange="displayData('highway');">
+<tr><td>Велодорожка: <td><input name="highway" type="radio" value="cycleway" onchange="displayData('highway');">
+<tr><td>Тропинка: <td><input name="highway" type="radio" value="path" onchange="displayData('highway');">
+<tr><td>Лестница: <td><input name="highway" type="radio" value="steps" onchange="displayData('highway');">
+<tr><td>Паром: <td><input name="highway" type="radio" value="ferry" onchange="displayData('highway');">
</table>
</form>
</div>
@@ -238,16 +238,16 @@ Each segment of the chosen type of highway is drawn.
Each segment allowed for the chosen type of transport is drawn.
<form name="transports" id="transports" action="#" method="get" onsubmit="return false;">
<table>
-<tr><td>Foot: <td><input name="transport" type="radio" value="foot" onchange="displayData('transport');">
+<tr><td>Пешком: <td><input name="transport" type="radio" value="foot" onchange="displayData('transport');">
<tr><td>Лошадь: <td><input name="transport" type="radio" value="horse" onchange="displayData('transport');">
<tr><td>Инвалидное кресло:<td><input name="transport" type="radio" value="wheelchair" onchange="displayData('transport');">
<tr><td>Велосипед: <td><input name="transport" type="radio" value="bicycle" onchange="displayData('transport');">
<tr><td>Мопед: <td><input name="transport" type="radio" value="moped" onchange="displayData('transport');">
<tr><td>Мотоцикл:<td><input name="transport" type="radio" value="motorcycle" onchange="displayData('transport');">
-<tr><td>Motorcar: <td><input name="transport" type="radio" value="motorcar" onchange="displayData('transport');" checked>
-<tr><td>Товары: <td><input name="transport" type="radio" value="goods" onchange="displayData('transport');">
-<tr><td>HGV: <td><input name="transport" type="radio" value="hgv" onchange="displayData('transport');">
-<tr><td>PSV: <td><input name="transport" type="radio" value="psv" onchange="displayData('transport');">
+<tr><td>Машина: <td><input name="transport" type="radio" value="motorcar" onchange="displayData('transport');" checked>
+<tr><td>Фургон: <td><input name="transport" type="radio" value="goods" onchange="displayData('transport');">
+<tr><td>Грузовой автомобиль: <td><input name="transport" type="radio" value="hgv" onchange="displayData('transport');">
+<tr><td>Автобус: <td><input name="transport" type="radio" value="psv" onchange="displayData('transport');">
</table>
</form>
</div>
@@ -261,16 +261,16 @@ Each segment allowed for the chosen type of transport is drawn.
Each barrier blocking the chosen type of transport is drawn.
<form name="barriers" id="barriers" action="#" method="get" onsubmit="return false;">
<table>
-<tr><td>Foot: <td><input name="barrier" type="radio" value="foot" onchange="displayData('barrier');">
+<tr><td>Пешком: <td><input name="barrier" type="radio" value="foot" onchange="displayData('barrier');">
<tr><td>Лошадь: <td><input name="barrier" type="radio" value="horse" onchange="displayData('barrier');">
<tr><td>Инвалидное кресло:<td><input name="barrier" type="radio" value="wheelchair" onchange="displayData('barrier');">
<tr><td>Велосипед: <td><input name="barrier" type="radio" value="bicycle" onchange="displayData('barrier');">
<tr><td>Мопед: <td><input name="barrier" type="radio" value="moped" onchange="displayData('barrier');">
<tr><td>Мотоцикл:<td><input name="barrier" type="radio" value="motorcycle" onchange="displayData('barrier');">
-<tr><td>Motorcar: <td><input name="barrier" type="radio" value="motorcar" onchange="displayData('barrier');" checked>
-<tr><td>Товары: <td><input name="barrier" type="radio" value="goods" onchange="displayData('barrier');">
-<tr><td>HGV: <td><input name="barrier" type="radio" value="hgv" onchange="displayData('barrier');">
-<tr><td>PSV: <td><input name="barrier" type="radio" value="psv" onchange="displayData('barrier');">
+<tr><td>Машина: <td><input name="barrier" type="radio" value="motorcar" onchange="displayData('barrier');" checked>
+<tr><td>Фургон: <td><input name="barrier" type="radio" value="goods" onchange="displayData('barrier');">
+<tr><td>Грузовой автомобиль: <td><input name="barrier" type="radio" value="hgv" onchange="displayData('barrier');">
+<tr><td>Автобус: <td><input name="barrier" type="radio" value="psv" onchange="displayData('barrier');">
</table>
</form>
</div>
@@ -295,7 +295,7 @@ along with the speed limit on relevant segments.
<br>
<table>
<tr><td><img src="icons/ball-1.png" alt="." ><td>Изменить ограничения
-<tr><td><img src="icons/limit-no.png" alt="()" ><td>No specified limit
+<tr><td><img src="icons/limit-no.png" alt="()" ><td>Нет отграничений
<tr><td><img src="icons/limit-80.png" alt="(80)"><td>Ограничение скорости 80 км/ч
</table>
</div>
@@ -311,7 +311,7 @@ along with the weight limit on relevant segments.
<br>
<table>
<tr><td><img src="icons/ball-1.png" alt="." ><td>Изменить ограничения
-<tr><td><img src="icons/limit-no.png" alt="()" ><td>No specified limit
+<tr><td><img src="icons/limit-no.png" alt="()" ><td>Нет отграничений
<tr><td><img src="icons/limit-8.0.png" alt="(8.0)"><td>Ограничение веса 8 тонн
</table>
</div>
@@ -327,7 +327,7 @@ along with the height limit on relevant segments.
<br>
<table>
<tr><td><img src="icons/ball-1.png" alt="." ><td>Изменить ограничения
-<tr><td><img src="icons/limit-no.png" alt="()" ><td>No specified limit
+<tr><td><img src="icons/limit-no.png" alt="()" ><td>Нет отграничений
<tr><td><img src="icons/limit-4.0.png" alt="(4.0)"><td>Ограничение высоты 4.0 метра
</table>
</div>
@@ -343,8 +343,8 @@ along with the width limit on relevant segments.
<br>
<table>
<tr><td><img src="icons/ball-1.png" alt="." ><td>Изменить ограничения
-<tr><td><img src="icons/limit-no.png" alt="()" ><td>No specified limit
-<tr><td><img src="icons/limit-3.0.png" alt="(3.0)"><td>3.0 m width limit
+<tr><td><img src="icons/limit-no.png" alt="()" ><td>Нет отграничений
+<tr><td><img src="icons/limit-3.0.png" alt="(3.0)"><td>Ограничение ширины 3.0 метра
</table>
</div>
</div>
@@ -352,15 +352,15 @@ along with the width limit on relevant segments.
<div class="hideshow_box">
<span id="hideshow_length_show" onclick="hideshow_show('length');" class="hideshow_show">+</span>
<span id="hideshow_length_hide" onclick="hideshow_hide('length');" class="hideshow_hide">-</span>
-<input type="button" id="length" onclick="displayData('length');" value="Display Length Limits">
+<input type="button" id="length" onclick="displayData('length');" value="Показать ограничения длинны">
<div id="hideshow_length_div" style="display: none;">
Each node that joins segments with different length limits is shown
along with the length limit on relevant segments.
<br>
<table>
<tr><td><img src="icons/ball-1.png" alt="." ><td>Изменить ограничения
-<tr><td><img src="icons/limit-no.png" alt="()" ><td>No specified limit
-<tr><td><img src="icons/limit-9.0.png" alt="(9.0)"><td>9.0 m length limit
+<tr><td><img src="icons/limit-no.png" alt="()" ><td>Нет отграничений
+<tr><td><img src="icons/limit-9.0.png" alt="(9.0)"><td>Ограничение длинны 9.0 метров
</table>
</div>
</div>
@@ -373,8 +373,8 @@ along with the length limit on relevant segments.
Each segment of the highways with a particular property is drawn.
<form name="properties" id="properties" action="#" method="get" onsubmit="return false;">
<table>
-<tr><td>Paved: <td><input name="property" type="radio" value="paved" onchange="displayData('property');" checked>
-<tr><td>Multiple Lanes: <td><input name="property" type="radio" value="multilane" onchange="displayData('property');">
+<tr><td>Мощеная: <td><input name="property" type="radio" value="paved" onchange="displayData('property');" checked>
+<tr><td>Многополосная: <td><input name="property" type="radio" value="multilane" onchange="displayData('property');">
<tr><td>Мост: <td><input name="property" type="radio" value="bridge" onchange="displayData('property');">
<tr><td>Туннель: <td><input name="property" type="radio" value="tunnel" onchange="displayData('property');">
<tr><td>Пеший маршрут: <td><input name="property" type="radio" value="footroute" onchange="displayData('property');">
@@ -387,21 +387,21 @@ Each segment of the highways with a particular property is drawn.
<div class="hideshow_box">
<span id="hideshow_errorlogs_show" onclick="hideshow_show('errorlogs');" class="hideshow_show">+</span>
<span id="hideshow_errorlogs_hide" onclick="hideshow_hide('errorlogs');" class="hideshow_hide">-</span>
-<input type="button" id="errorlogs" onclick="displayData('errorlogs');" value="Display Error Logs">
+<input type="button" id="errorlogs" onclick="displayData('errorlogs');" value="Показать лог ошибок">
<div id="hideshow_errorlogs_div" style="display: none;">
Potential problems found by Routino when processing the input data.
</div>
</div>
<div class="hideshow_box">
-<input type="button" id="clear" onclick="displayData('');" value="Clear data">
+<input type="button" id="clear" onclick="displayData('');" value="Очистить данные">
</div>
<div class="hideshow_box">
-<span class="hideshow_title">Links</span>
+<span class="hideshow_title">Ссылки</span>
<a id="permalink_url" href="visualiser.html">Link to this map view</a>
<br>
-<a id="edit_url" target="edit" style="display: none;">Edit this OSM data</a>
+<a id="edit_url" target="edit" style="display: none;">Редактировать данные OSM</a>
</div>
<div class="hideshow_box">
@@ -431,7 +431,7 @@ again.
<div class="tab_content" id="tab_router_div" style="display: none;">
<div class="hideshow_box">
<span class="hideshow_title">Routino Router</span>
-To perform routing on the map use the link below.
+Для прокладки маршрута на карте используйте ссылку ниже.
<br>
<a id="router_url" href="router.html" target="router">Link to this map view</a>
</div>
@@ -439,9 +439,9 @@ To perform routing on the map use the link below.
<div class="tab_content" id="tab_data_div" style="display: none;">
<div class="hideshow_box">
-<span class="hideshow_title">Routino Statistics</span>
+<span class="hideshow_title">Routino Статистика</span>
<div id="statistics_data"></div>
-<a id="statistics_link" href="statistics.cgi" onclick="displayStatistics();return(false);">Display data statistics</a>
+<a id="statistics_link" href="statistics.cgi" onclick="displayStatistics();return(false);">Показать статистику данных</a>
</div>
</div>
@@ -453,13 +453,13 @@ To perform routing on the map use the link below.
<div class="map" id="map">
<noscript>
<p>
-Javascript is <em>required</em> to use this web page because of the interactive map.
+Javascript <em>обязателен</em> для просмотра данной страницы, так как на ней используется интерактивная карта.
</noscript>
</div>
<div class="attribution">
Router: <a href="http://www.routino.org/" target="routino">Routino</a>
|
-Geo Data: <span id="attribution_data"></span>
+Гео данные: <span id="attribution_data"></span>
|
Тайлы: <span id="attribution_tile"></span>
</div>
diff --git a/xml/routino-tagging.xml b/xml/routino-tagging.xml
index e2c4321..3f2edf4 100644
--- a/xml/routino-tagging.xml
+++ b/xml/routino-tagging.xml
@@ -162,7 +162,20 @@
</if> <!-- k="barrier" -->
- <!-- Normalisation of access tags -->
+ <!-- Normalisation of access tag keys -->
+
+ <ifnot k="foot" > <if k="access:foot" > <set k="foot" /> </if> </ifnot>
+ <ifnot k="horse" > <if k="access:horse" > <set k="horse" /> </if> </ifnot>
+ <ifnot k="wheelchair"> <if k="access:wheelchair"> <set k="wheelchair"/> </if> </ifnot>
+ <ifnot k="bicycle" > <if k="access:bicycle" > <set k="bicycle" /> </if> </ifnot>
+ <ifnot k="moped" > <if k="access:moped" > <set k="moped" /> </if> </ifnot>
+ <ifnot k="motorcycle"> <if k="access:motorcycle"> <set k="motorcycle"/> </if> </ifnot>
+ <ifnot k="motorcar" > <if k="access:motorcar" > <set k="motorcar" /> </if> </ifnot>
+ <ifnot k="goods" > <if k="access:goods" > <set k="goods" /> </if> </ifnot>
+ <ifnot k="hgv" > <if k="access:hgv" > <set k="hgv" /> </if> </ifnot>
+ <ifnot k="psv" > <if k="access:psv" > <set k="psv" /> </if> </ifnot>
+
+ <!-- Normalisation of access tag values -->
<if v="designated" > <set v="yes"/> </if>
<if v="permissive" > <set v="yes"/> </if>
@@ -170,7 +183,7 @@
<if v="true" > <set v="yes"/> </if>
<if v="public" > <set v="yes"/> </if>
<if v="official" > <set v="yes"/> </if>
-
+
<if v="unsuitable" > <set v="no"/> </if>
<if v="private" > <set v="no"/> </if>
<if v="limited" > <set v="no"/> </if>
@@ -590,7 +603,20 @@
<logerror message="ignoring it"/>
</if>
- <!-- Normalisation of access tags -->
+ <!-- Normalisation of access tag keys -->
+
+ <ifnot k="foot" > <if k="access:foot" > <set k="foot" /> </if> </ifnot>
+ <ifnot k="horse" > <if k="access:horse" > <set k="horse" /> </if> </ifnot>
+ <ifnot k="wheelchair"> <if k="access:wheelchair"> <set k="wheelchair"/> </if> </ifnot>
+ <ifnot k="bicycle" > <if k="access:bicycle" > <set k="bicycle" /> </if> </ifnot>
+ <ifnot k="moped" > <if k="access:moped" > <set k="moped" /> </if> </ifnot>
+ <ifnot k="motorcycle"> <if k="access:motorcycle"> <set k="motorcycle"/> </if> </ifnot>
+ <ifnot k="motorcar" > <if k="access:motorcar" > <set k="motorcar" /> </if> </ifnot>
+ <ifnot k="goods" > <if k="access:goods" > <set k="goods" /> </if> </ifnot>
+ <ifnot k="hgv" > <if k="access:hgv" > <set k="hgv" /> </if> </ifnot>
+ <ifnot k="psv" > <if k="access:psv" > <set k="psv" /> </if> </ifnot>
+
+ <!-- Normalisation of access tag values -->
<if v="designated" > <set v="yes"/> </if>
<if v="permissive" > <set v="yes"/> </if>
@@ -600,7 +626,7 @@
<if v="customers" > <set v="yes"/> </if>
<if v="customer" > <set v="yes"/> </if>
<if v="official" > <set v="yes"/> </if>
-
+
<if v="unsuitable" > <set v="no"/> </if>
<if v="private" > <set v="no"/> </if>
<if v="limited" > <set v="no"/> </if>
diff --git a/xml/routino-translations.xml b/xml/routino-translations.xml
index c4e9472..060d3a4 100644
--- a/xml/routino-translations.xml
+++ b/xml/routino-translations.xml
@@ -272,7 +272,7 @@
<start text="Débute à %s, direction %s" /> <!-- 1st %s = [waypoint|junction], 2nd %s = [heading] -->
<node text="à %s, aller %s direction %s" /> <!-- 1st %s = [waypoint|junction], 2nd %s = [turn], 3rd %s = [heading] -->
- <rbnode text="Quitter %s, prendre le %s sortir direction %s" /> <!-- 1st %s = [roundabout], 2nd %s = [first|second|...], 3rd %s = [heading] -->
+ <rbnode text="Quitter %s, prendre la sortie %s direction %s" /> <!-- 1st %s = [roundabout], 2nd %s = [first|second|...], 3rd %s = [heading] -->
<segment text="Suivre %s pendant %.3f km, %.1f min" /> <!-- 1st %s = street name -->
<stop text="S'arrêter à %s" /> <!-- 1st %s = [waypoint|junction] -->
<total text="Total %.1f km, %.0f minutes" />
@@ -281,7 +281,7 @@
<!-- GPX output -->
<output-gpx>
- <!-- TRANSLATION REQUIRED: waypoint type="waypt" string="WAYPT" / --> <!-- For the route waypoints -->
+ <waypoint type="waypt" string="ETAPE" /> <!-- For the route waypoints -->
<waypoint type="trip" string="POINT" /> <!-- For the other route points -->
<desc text="Itinéraire %s entre les étapes 'début' et 'fin'" /> <!-- %s = [shortest|quickest] -->
@@ -541,7 +541,7 @@
<!-- HTML output -->
<output-html>
<waypoint type="waypoint" string="Punkt" /> <!-- For the chosen waypoints -->
- <!-- TRANSLATION REQUIRED: waypoint type="junction" string="Junction" / --> <!-- For the interesting junctions -->
+ <waypoint type="junction" string="Połączenie" /> <!-- For the interesting junctions -->
<waypoint type="roundabout" string="Rondo" /> <!-- For roundabouts -->
<title text="%s Trasa" /> <!-- %s = [shortest|quickest] -->
@@ -557,8 +557,8 @@
<!-- GPX output -->
<output-gpx>
- <!-- TRANSLATION REQUIRED: waypoint type="waypt" string="WAYPT" / --> <!-- For the route waypoints -->
- <!-- TRANSLATION REQUIRED: waypoint type="trip" string="TRIP" / --> <!-- For the other route points -->
+ <waypoint type="waypt" string="Punkt" /> <!-- For the route waypoints -->
+ <waypoint type="trip" string="Podróż" /> <!-- For the other route points -->
<desc text="%s trasa pomiędzy 'start' a 'koniec'" /> <!-- %s = [shortest|quickest] -->
<name text="%s trasa" /> <!-- %s = [shortest|quickest] -->
@@ -627,14 +627,14 @@
<highway type="ferry" string="паром" />
<!-- The type of route -->
- <route type="shortest" string="Короткий" /> <!-- For the description and route name -->
+ <route type="shortest" string="Кратчайший" /> <!-- For the description and route name -->
<route type="quickest" string="Быстрый" /> <!-- For the description and route name -->
<!-- HTML output -->
<output-html>
- <waypoint type="waypoint" string="путевая точка" /> <!-- For the chosen waypoints -->
+ <waypoint type="waypoint" string="Точка" /> <!-- For the chosen waypoints -->
<waypoint type="junction" string="перекрестке" /> <!-- For the interesting junctions -->
- <!-- TRANSLATION REQUIRED: waypoint type="roundabout" string="Roundabout" / --> <!-- For roundabouts -->
+ <waypoint type="roundabout" string="круговое движение" /> <!-- For roundabouts -->
<title text="%s маршрут" /> <!-- %s = [shortest|quickest] -->
@@ -649,7 +649,7 @@
<!-- GPX output -->
<output-gpx>
- <!-- TRANSLATION REQUIRED: waypoint type="waypt" string="WAYPT" / --> <!-- For the route waypoints -->
+ <waypoint type="waypt" string="ТОЧКА" /> <!-- For the route waypoints -->
<!-- TRANSLATION REQUIRED: waypoint type="trip" string="TRIP" / --> <!-- For the other route points -->
<desc text="%s маршрут от 'Старта' до 'Финиша'" /> <!-- %s = [shortest|quickest] -->
--
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