1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585 10586 10587 10588 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607 10608 10609 10610 10611 10612 10613 10614 10615 10616 10617 10618 10619 10620 10621 10622 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650
|
2025-04-26 Andrew M. Bishop <amb>
Version 3.4.3 released.
2025-04-26 [r2207] Andrew M. Bishop <amb>
* doc/html/readme.html: Fix typo in release notes.
2025-04-26 [r2205] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Update to version 3.4.3.
2025-04-09 [r2203] Andrew M. Bishop <amb>
* src/files.c, src/files.h, src/sorting.c: Merge the "filebuffer"
and "openedfile" data structures. Add a new function for deleting
an open buffered file. Improve the new logassert messages to
print the filename.
2025-04-08 [r2202] Andrew M. Bishop <amb>
* src/files.c: Allocate the string for the filename of the mapped
files. Don't allocate a filebuffer structure for mapped files.
2025-04-06 [r2201] Andrew M. Bishop <amb>
* src/files.c: Print an error message and exit if read/write fails.
2025-04-06 [r2200] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-finder.c, src/files.c, src/logerror.c,
src/planetsplitter.c, src/router.c, src/uncompress.c,
src/xml/xsd-to-xmlparser.c: Check and update all exits from the
program to make sure that there is consistency in the error
messages. Use logassert if it's an internal bug, use
fprintf();exit() if it's a user error or program failure to
route.
2025-04-06 [r2199] Andrew M. Bishop <amb>
* src/nodesx.c, src/relationsx.c, src/waysx.c: Revert part of r2189
and add extra checks on the sizes of node_t, way_t and relation_t
with respect to index_t.
2025-04-05 [r2198] Andrew M. Bishop <amb>
* src/logging.c, src/logging.h: Create a logassert function that
allows a format string (via a pre-processor hack).
2025-04-05 [r2197] Andrew M. Bishop <amb>
* src/version.h: Update the version number to make clear it is
modified from the release version.
2025-03-29 Andrew M. Bishop <amb>
Version 3.4.2 released.
2025-03-29 [r2193] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Update to version 3.4.2.
2024-09-18 [r2192] Andrew M. Bishop <amb>
* src/output.c: Fix compilation warnings if index_t is changed to a
64-bit type but preserve formatting of fake nodes (shown as
negative).
2024-09-18 [r2191] Andrew M. Bishop <amb>
* python/setup.py: Add header files as dependencies for the Python
module.
2024-09-03 [r2190] Andrew M. Bishop <amb>
* src/types.h: Change the lower limit for fake nodes when index_t
is a 64-bit number.
2024-09-01 [r2189] Andrew M. Bishop <amb>
* src/relationsx.c, src/waysx.c: Change some types and correct some
comparisons that cause errors if index_t is changed to a 64-bit
type (prompted by patch from a user).
2024-08-29 [r2188] Andrew M. Bishop <amb>
* src/files.c, src/output.c, src/router+lib.c, src/routino.c,
src/tagging.c: Swap the order of arguments to calloc() function
(new gcc warning).
2024-05-27 [r2187] Andrew M. Bishop <amb>
* src/optimiser.c: Fix gcc-13 false-positive warning.
2024-03-17 [r2186] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Added more/updated German
translations (via http://www.routino.org/translations/).
2024-02-27 [r2185] Andrew M. Bishop <amb>
* web/translations/translation.es.txt: Added more Spanish
translations (via http://www.routino.org/translations/).
2023-08-29 [r2182-2183] Andrew M. Bishop <amb>
* src/osmparser.c: Add new parsers for heights/widths in feet and
inches format.
* xml/routino-tagging.xml: Update the way tagging, minor changes.
2023-08-28 [r2178-2179] Andrew M. Bishop <amb>
* extras/errorlog/summarise-log.pl: Include the first 100 links
(rather than none) if there are more than 100 of them.
* xml/routino-tagging.xml: Rework the node tagging, only consider
barriers as blocking access. Now cycle_barrier defaults to
allowing bicycles (unlike the {horse,motorcycle,car}_barrier
which block the named transport).
2023-08-26 [r2177] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: XML formatting tidy-up (no functional
change).
2023-08-25 [r2176] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Always have a 'k' attribute on
'logerror' objects (for clarity).
2023-07-16 [r2173] Andrew M. Bishop <amb>
* src/sorting.c: Fix bug with using uninitialised memory - found by
valgrind.
2023-07-16 [r2172] Andrew M. Bishop <amb>
* src/sorting.c: Refactor the code to put the file merging into a
separate function and share it between the two types of sort.
2023-07-15 [r2171] Andrew M. Bishop <amb>
* src/sorting.c: Simplify and comment the threading functions. Fix
a potential deadlock if the last thread finished before we wait
for them.
2023-07-13 [r2170] Andrew M. Bishop <amb>
* extras/find-fixme/osmparser.c, src/osmo5mparse.c,
src/osmparser.c, src/osmparser.h, src/osmpbfparse.c,
src/osmxmlparse.c: Refactor the OSM file parsing to move code
from individual file format specific parsers to the shared parser
back-end.
2023-07-05 [r2169] Andrew M. Bishop <amb>
* src/sorting.c: Create separate functions for thread handling.
2023-07-04 [r2168] Andrew M. Bishop <amb>
* src/sorting.c: Merge functions filesort_fixed_heapsort_thread and
filesort_vary_heapsort_thread.
2023-07-04 [r2167] Andrew M. Bishop <amb>
* src/version.h: Update the version number to show it is from SVN
not a release.
2023-07-03 [r2166] Andrew M. Bishop <amb>
* src/sorting.c: Review the sorting problems fixed in v4.3.1 and
update the code to:
* Make it clearer to the reader how it works.
* Better at choosing the number of threads to use.
* Optimise the data per thread (uses less memory in some cases).
* Add optional debug output.
* Remove the real cause of the bug in v3.4 (affected only when all the data fitted into
RAM with a single thread which is why it only appeared when the default RAM size was
increased).
2023-07-01 Andrew M. Bishop <amb>
Version 3.4.1 released.
2023-07-01 [r2162] Andrew M. Bishop <amb>
* src/sorting.c: Last minute fix for v3.4.1.
2023-07-01 [r2157-2158] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Update to version 3.4.1.
* src/sorting.c: Fix a bug that was introduced in r2138 (sorting
failure in some cases, unclear which but not found in tests of
slim mode or when using multiple threads).
2023-06-11 Andrew M. Bishop <amb>
Version 3.4 released.
2023-06-11 [r2153] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/html/readme.html: Update to version 3.4.
2023-06-11 [r2152] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.openlayers.js,
web/www/routino/visualiser.openlayers.js: Update to OpenLayers
7.4.0.
2023-06-11 [r2151] Andrew M. Bishop <amb>
* web/www/leaflet/install.sh, web/www/openlayers/install.sh,
web/www/routino/router.openlayers.js: Update to leaflet 1.9.4 and
OpenLayers 7.4.0.
2023-06-11 [r2146] Andrew M. Bishop <amb>
* doc/README.txt: Update to version 3.4.
2023-06-11 [r2144-2145] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt: Update to version 3.4.
* doc/README.txt, doc/html/readme.html, src/version.h: Update to
version 3.4.
2023-06-06 [r2141] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html, extras/find-fixme/README.txt,
extras/find-fixme/fixme-finder.c, src/planetsplitter.c: Change
the default amount of sorting RAM from 64 or 256 MB to 256 or
1024 MB.
2023-06-06 [r2139] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Examine the 'access' tag only for nodes
that are barriers.
2023-05-30 [r2138] Andrew M. Bishop <amb>
* src/sorting.c: If the number of items to be sorted is small then
do not create multiple threads.
2023-05-30 [r2137] Andrew M. Bishop <amb>
* src/sorting.c: Delete the file even if there is only one
(normally no file is created in this case) because of the rare
case where more than one was expected but the second one was not
needed.
2023-05-29 [r2136] Andrew M. Bishop <amb>
* src/sorting.c: Improve the shortcut if all the data fitted into
RAM (1/Nth of the RAM if multi-threaded) so that it is not
written to disk at all.
2023-05-29 [r2135] Andrew M. Bishop <amb>
* src/sorting.c: Fix a bug (slight data loss) introduced in r2132
when not using multi-threaded sorting.
2023-05-29 [r2134] Andrew M. Bishop <amb>
* src/sorting.c: Fix a serious bug (thread deadlock) introduced in
r2131 when using multi-threaded sorting on certain workloads.
2023-05-24 [r2133] Andrew M. Bishop <amb>
* src/segmentsx.c: Fix error with logging about the number of
duplicated segments.
2023-05-08 [r2132] Andrew M. Bishop <amb>
* src/sorting.c: Remove the mutex around the file writing (but not
the opening and closing) so that threads can write in parallel.
2023-05-08 [r2131] Andrew M. Bishop <amb>
* src/sorting.c: With multi-threaded sorting allow all N sorting
threads to run at once not just N-1 sorting threads and the pre
function in the main thread (the new code assumes the pre
function is quicker than the sorting, the old code assumed the
opposite).
2023-05-08 [r2130] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Add a missing function and explain why
ProcessErrorLogs appears twice.
2023-05-08 [r2129] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Add missing entry.
2023-05-08 [r2128] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/planetsplitter.c, src/segmentsx.c,
src/segmentsx.h: Merge ProcessSegments into SortSegmentList
(avoids writing the data to disk and them immediately reading it
all in again).
2023-05-08 [r2127] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Add new columns for reading and writing the
data files.
2023-03-18 [r2125] Andrew M. Bishop <amb>
* python/Makefile, python/pyproject.toml (added): Do not try to
install the Python module when running 'make install' but write a
warning message explaining why and offering suggestions. Add a
pyproject.toml file.
2023-02-13 [r2124] Andrew M. Bishop <amb>
* web/translations/translation.es.txt: Updated Spanish translations
(via http://www.routino.org/translations/).
2022-08-09 [r2123] Andrew M. Bishop <amb>
* doc/INSTALL.txt: Fix name of default Apache configuration file.
2022-08-09 [r2122] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add platforms (railway=platform or
public_transport=platform) as highways (equivalent to a path).
2022-07-11 [r2121] Andrew M. Bishop <amb>
* web/translations/translation.sk.txt: Updated Slovak translations
(via http://www.routino.org/translations/).
2022-07-10 [r2113-2114] Andrew M. Bishop <amb>
* web/www/routino: Ignore files that should not have been checked
in.
* web/www/routino/router.html.sk (removed),
web/www/routino/visualiser.html.sk (removed): Remove files that
should not have been checked in.
2022-07-10 [r2112] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Don't route through barriers (fence,
wall etc) that are explicitly tagged on a node. Add a few more
barrier types.
2022-07-10 [2111] Andrew M. Bishop <amb>
* doc/html/style.css: Update style sheet for the documentation.
2022-07-10 [r2110] Andrew M. Bishop <amb>
* src/relationsx.c, src/waysx.c: Drop data and log an error rather
than exit if a way or relation contains too much data.
2022-07-10 [r2109] Andrew M. Bishop <amb>
* web/translations/translation.sk.txt,
web/www/routino/router.html.sk,
web/www/routino/visualiser.html.sk: Updated Slovak translations
(via http://www.routino.org/translations/).
2022-07-02 [r2108] Andrew M. Bishop <amb>
* web/translations/translation.sk.txt,
web/www/routino/router.html.sk,
web/www/routino/visualiser.html.sk, xml/routino-translations.xml:
Updated Slovak translations (via
http://www.routino.org/translations/).
2022-06-24 [r2107] Andrew M. Bishop <amb>
* web/translations/translation.sk.txt (added),
web/www/routino/router.html.sk (added),
web/www/routino/visualiser.html.sk (added),
xml/routino-translations.xml: Added Slovak translation (via
http://www.routino.org/translations/).
2022-05-21 [r2106] Andrew M. Bishop <amb>
* src/nodesx.c: When not running in slim mode use the OSM node
number rather than the database node number for determining
whether a node is used by a way. Huge speed improvement for large
databases.
2022-05-21 [r2105] Andrew M. Bishop <amb>
* src/nodesx.c, src/prunex.c, src/segmentsx.c, src/superx.c,
src/typesx.h: Use 64-bit integers as the base type for the
BitMask type. Simplify some of the BitMask macros.
2022-05-21 [r2104] Andrew M. Bishop <amb>
* extras/plot-time/README.txt,
extras/plot-time/plot-planetsplitter-memory.pl (added),
extras/plot-time/plot-planetsplitter-time.pl: Add another script
to plot the amount of memory used.
2022-05-21 [r2103] Andrew M. Bishop <amb>
* extras/plot-time/plot-planetsplitter-time.pl: Fix bugs in
processing (change to end error message, ignore memory usage).
2022-05-19 [r2102] Andrew M. Bishop <amb>
* python/setup.py: Change from distutils to setuptools for building
Python modules.
2022-02-20 [r2101] Andrew M. Bishop <amb>
* web/translations/translation.fr.txt: More French translations
(via http://www.routino.org/translations/).
2022-01-08 [r2097] Andrew M. Bishop <amb>
* src/errorlogx.c: Avoid infinite recursion if a route relation
with no nodes or ways contains other similar relations including
itself.
2021-10-09 [r2096] Andrew M. Bishop <amb>
* web/translations/translation.pl.txt,
xml/routino-translations.xml: More Polish translations (via
http://www.routino.org/translations/).
2021-05-18 [r2094-2095] Andrew M. Bishop <amb>
* web/translations/translation.fr.txt: Updated French translations
(via http://www.routino.org/translations/).
* src/version.h: Update version so that we know it is from SVN.
2020-12-30 Andrew M. Bishop <amb>
Version 3.3.3 released.
2020-12-30 [r2092] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Updated for version 3.3.3 release.
2020-12-30 [r2090-2091] Andrew M. Bishop <amb>
* web/translations/translation.fi.txt (added), web/www/routino,
xml/routino-translations.xml:
Added Finnish translation.
2020-12-13 [r2089] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Add a note clarifying the
setting of highway properties when processing tags.
2020-12-13 [r2089] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Add a note clarifying the
setting of highway properties when processing tags.
2020-11-22 [r2087] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js: Include some margin around
the markers when zooming (particularly a problem for openlayers
with non-integer zoom).
2020-11-21 [r2084] Andrew M. Bishop <amb>
* doc/CONFIGURATION.txt, doc/html/configuration.html: Make a
clarification and fix an error in the configuration file
documentation.
2020-11-21 [r2083] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/leaflet/install.sh, web/www/openlayers/install.sh,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: Test with OpenLayers
6.4.3 and Leaflet 1.7.1. Update install script, install
instructions and change javascript to handle differences.
2020-11-17 [r2077] Andrew M. Bishop <amb>
* src/errorlog.c, src/nodes.c, src/nodesx.c, src/relations.c,
src/relationsx.c, src/waysx.c: Small update to simplify binary
search implementations.
2020-11-15 [r2076] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Update tagging rules (based on common UK
usage, wiki and taginfo).
2020-11-14 [r2075] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: Update the
visualiser/fixme data as you move around the map.
2020-10-13 [r2074] Andrew M. Bishop <amb>
* web/translations/translation.cs.txt,
xml/routino-translations.xml: Updated Czech translations (via
http://www.routino.org/translations/).
2020-10-04 [r2073] Andrew M. Bishop <amb>
* web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: When selecting data to
view update the URL and permalink so that it automatically
displays the same thing next time.
2020-10-04 [r2072] Andrew M. Bishop <amb>
* web/www/routino/router.openlayers.js: Fix error with setting
initial map view.
2020-09-06 [r2071] Andrew M. Bishop <amb>
* web/translations/translation.nl.txt,
xml/routino-translations.xml: Updated Dutch translations (via
http://www.routino.org/translations/).
2020-08-17 [r2068-2069] Andrew M. Bishop <amb>
* src/routino.c: Fix testing of parameters when calling
Routino_LoadDatabase().
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: Update the URL when
new waypoints are added etc.
2020-08-13 [r2067] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/routino/maploader.js, web/www/routino/mapprops.js,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: Allow multiple map
libraries to be used with the web pages and select between them
with a URL argument.
2020-08-10 [r2064] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.openlayers2.js: Fix errors when
zooming to the markers from the URL for openlayers.
2020-08-09 [r2063] Andrew M. Bishop <amb>
* src/Makefile, src/filedumper.c, src/filedumperx.c: Merge changes
from destination access branch [improvements to filedumper &
filedumperx].
2020-08-09 [r2062] Andrew M. Bishop <amb> (from 'branches/destination-access')
* src/Makefile, src/filedumperx.c: Make the output of filedumperx more
user-friendly.
2020-08-09 [r2061] Andrew M. Bishop <amb> (from 'branches/destination-access')
* src/filedumper.c: Add more hex digits when printing out the access and
highway values.
2020-08-09 [r2060] Andrew M. Bishop <amb> (from 'branches/destination-access')
* src/filedumperx.c: Add more hex digits when printing out the access and
highway values.
2020-08-08 [r2058] Andrew M. Bishop <amb>
* Makefile.conf, doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/Makefile, extras/statistics/Makefile,
extras/tagmodifier/Makefile: Add options to the makefiles to
compile for code coverage or profiling.
2020-08-05 [r2055] Andrew M. Bishop <amb>
* src/nodesx.c, src/waysx.c: Ensure that empty spaces in files are
filled with zero values (to simplify regression testing).
2020-08-03 [r2054] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js: Fix zooming to markers in
URL if there are none or just one.
2020-08-03 [r2053] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js: Improve the setting /
clearing of the cookie for the home location.
2020-08-03 [r2052] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: If on a web page that
has a language specific extension then make sure that the links
between the router and visualiser also use that extension.
2020-07-31 [r2051] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js: Zoom to the visible
markers when initialising the form from the URL if there was no
lat/long/zoom specified in the URL itself.
2020-07-14 [r2049] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html: Updated documentation due to
an error for planetsplitter "--tagging" option.
2020-07-08 [r2048] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: More German translations
(via http://www.routino.org/translations/).
2020-05-15 [r2047] Andrew M. Bishop <amb>
* src/routino.c: Catch NULL pointers being passed into the library
functions.
2020-05-15 [r2046] Andrew M. Bishop <amb>
* python/src/router.i: Bug fix for supporting the progress callback
function.
2020-05-14 [r2045] Andrew M. Bishop <amb>
* python/router.py, python/src/router.i: Support the use of the
progress callback function in the Python routino.CalculateRoute()
function.
2020-04-19 [r2043] Andrew M. Bishop <amb>
* web/www/routino/router.openlayers2.js: Fix indentation.
2020-04-19 [r2042] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
extras/find-fixme/web/www/fixme.openlayers2.js: Compare
Javascript files and merge best features into each other. Fix
error with handling of mapprops.browseurl.
2020-04-18 [r2041] Andrew M. Bishop <amb>
* web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/visualiser.openlayers2.js: Fix error with
handling of mapprops.browseurl.
2020-04-18 [r2040] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers2.js: Compare Javascript
files and merge best features into each other.
2020-04-07 [r2038-2039] Andrew M. Bishop <amb>
* xml/routino-translations.xml: More Russian translations (via
http://www.routino.org/translations/).
* web/translations/translation.ru.txt: More Russian translations
(via http://www.routino.org/translations/).
2019-12-20 [r2037] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: More German translations
(via http://www.routino.org/translations/).
2019-11-03 [r2036] Andrew M. Bishop <amb>
* src/errorlogx.c: Ensure that we do not try memory mapping a zero
length file.
2019-10-14 [r2035] Andrew M. Bishop <amb>
* src/waysx.c: Remove unnecessary modification of way id.
2019-10-13 [r2034] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Correct an error in latest change.
2019-10-10 [r2033] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/errorlogx.c, src/nodesx.c, src/nodesx.h,
src/relationsx.c, src/relationsx.h, src/segmentsx.c, src/waysx.c,
src/waysx.h: Reduce memory consumption by writing the index to a
file and mapping it in to memory rather than allocating large
amounts of memory.
2019-09-22 [r2032] Andrew M. Bishop <amb>
* python/Makefile: Include the DESTDIR flag when calling setup.py
to install.
2019-09-22 [r2031] Andrew M. Bishop <amb>
* python/Makefile: Avoid setting LDFLAGS in the environment when
calling setup.py.
2019-09-21 [r2030] Andrew M. Bishop <amb>
* python/Makefile: Avoid setting CFLAGS in the environment when
calling setup.py.
2019-09-20 [r2029] Andrew M. Bishop <amb>
* src/version.h: Change the version number so that compiling from
SVN has a different version than from using a release version.
2019-09-18 Andrew M. Bishop <amb>
Version 3.3.2 released.
2019-09-18 [r2025] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Update for version 3.3.2 release.
2019-09-09 [r2023] Andrew M. Bishop <amb>
* python/Makefile: Fix parallel compilation in the 'python'
directory.
2019-09-08 Andrew M. Bishop <amb>
Version 3.3.1 released.
2019-09-08 [r2019] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update
for version 3.3.1 release.
2019-09-08 [r2017-2018] Andrew M. Bishop <amb>
* python/Makefile: Make sure that 'make clean' deletes all files
generated by swig.
* python/README.txt: Correct tiny mistake in documentation
formatting.
2019-09-07 Andrew M. Bishop <amb>
Version 3.3 released.
2019-09-07 [r2013] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update
for version 3.3 release.
2019-09-07 [r2012] Andrew M. Bishop <amb>
* web/translations/translation.cs.txt (added), web/www/routino,
xml/routino-translations.xml: Added an incomplete Czech
translation.
2019-09-01 [r2010] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/README.txt, doc/html/installation.html,
doc/html/readme.html: Update Openlayers version 2 URL.
2019-08-31 [r2005-2007] Andrew M. Bishop <amb>
* web/www/routino/maplayout.css: Include the CSS fix for the
current and previous Leaflet versions (merge of latest and
previous versions of this file).
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers2.js,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers2.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers2.js: Update Leaflet and
OpenLayers v2 scripts based on improvements made in the new
OpenLayers scripts.
* doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/web/www/fixme.openlayers.js (added),
web/www/openlayers (added), web/www/openlayers/install.sh
(added), web/www/routino/maploader.js,
web/www/routino/mapprops.js, web/www/routino/router.openlayers.js
(added), web/www/routino/visualiser.openlayers.js (added): Add
support for the latest version of OpenLayers (version 5.x)
library as well as the older, incompatible, version.
2019-08-31 [r2004] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/web/www/fixme.openlayers.js (removed),
extras/find-fixme/web/www/fixme.openlayers2.js (added),
web/www/openlayers (removed), web/www/openlayers2 (added),
web/www/routino/maploader.js, web/www/routino/mapprops.js,
web/www/routino/router.openlayers.js (removed),
web/www/routino/router.openlayers2.js (added),
web/www/routino/visualiser.openlayers.js (removed),
web/www/routino/visualiser.openlayers2.js (added): Rename the
"openlayers" version of the web pages to "openlayers2" to
accurately reflect that they use the older OpenLayers version 2.x
library rather than the current, incompatible, version.
2019-08-03 [r2003] Andrew M. Bishop <amb>
* web/www/routino/maplayout.css: Fix for updated version of
Leaflet.
2019-08-02 [r2002] Andrew M. Bishop <amb>
* web/www/leaflet/install.sh: Update script to install latest
version of Leaflet.
2019-07-28 [r2001] Andrew M. Bishop <amb>
* src/logging.c: Increase the number of digits allocated for
elapsed time and allocated memory when logging that information.
2019-07-27 [r1999] Andrew M. Bishop <amb>
* src/errorlogx.c, src/logging.c, src/logging.h, src/nodesx.c,
src/prunex.c, src/relationsx.c, src/segmentsx.c, src/sorting.c,
src/superx.c, src/typesx.h, src/waysx.c: Add more checking of
memory allocation success/failure by combining the allocation and
the assert into one function.
2019-05-01 [r1995-1996] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Disallow access to highways tagged with
"access=destination" or "access=customer", the
"routino-destination" branch allows them instead.
* xml/routino-tagging.xml: Move some tag rules around so that
access denied by "motor_vehicles=no" overrides access allowed by
"designation=byway_open_to_all_traffic".
2019-04-25 [r1994] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js: Fix bug with
regexp generating link to node/way/relation on openstreetmap.org.
2019-04-17 [r1991] Andrew M. Bishop <amb>
* src/waysx.c: Rename some structure members and function names to
reflect more clearly their meaaning (mostly change "allow" to
"transport"). No changes to file formats or API.
2019-04-17 [r1989] Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.c, src/optimiser.c, src/output.c,
src/profiles.c, src/profiles.h, src/prunex.c, src/routino.c,
src/segments.c, src/types.c, src/types.h, src/ways.h,
src/waysx.c, src/waysx.h: Rename some structure members and
function names to reflect more clearly their meaning (mostly
change "allow" to "transport"). No changes to file formats or
API.
2019-04-13 [r1988] Andrew M. Bishop <amb>
* src/sorting.c: Ensure that data pointers are correctly aligned -
found by gcc's runtime sanitizer (make SANITIZE=1 test).
2019-04-13 [r1987] Andrew M. Bishop <amb>
* src/errorlogx.h: Revert change to this file because it broke
binary compatibility with version 3.2 output files.
2019-04-13 [r1986] Andrew M. Bishop <amb>
* src/sorting.c: Ensure that data pointers are correctly aligned -
found by gcc's runtime sanitizer (make SANITIZE=1 test).
2019-04-12 [r1985] Andrew M. Bishop <amb>
* src/errorlogx.h, src/files.h, src/sorting.c: Fix some integer
type usage (in relation to offset_t and size_t).
2019-04-07 [r1983] Andrew M. Bishop <amb>
* src/sorting.c: Ensure that data pointers are correctly aligned -
found by gcc's runtime sanitizer (make SANITIZE=1 test).
2019-04-07 [r1980-1982] Andrew M. Bishop <amb>
* src/test/run-one-test.sh, src/test/sanitizer-suppressions.txt
(added): Suppress some warnings to stop gcc's runtime sanitizer
complaining (make SANITIZE=1 test).
* src/osmo5mparse.c: Initialise some variables to stop gcc's
runtime sanitizer complaining (make SANITIZE=1 test).
* src/translations.c, src/ways.c, src/xml/xsd-to-xmlparser.c: Free
some memory to avoid leaks - found by running with gcc's runtime
sanitizer enabled (make SANITIZE=1 test).
2019-04-06 [r1979] Andrew M. Bishop <amb>
* src/errorlogx.c: Make the looking up of error latitude/longitude
more robust (don't trying looking up if there was no
node/way/relation to look for).
2019-04-06 [r1978] Andrew M. Bishop <amb>
* src/nodesx.h: Copy the improved comments from the "destination"
branch.
2019-03-31 [r1975] Andrew M. Bishop <amb>
* src/relationsx.c: Do not store the nodes as part of route
relations (but keep the file format compatible with the previous
one).
2019-03-31 [r1974] Andrew M. Bishop <amb>
* src/relationsx.c, src/sorting.h, src/waysx.c: Change some generic
integer types (unsigned short, int, unsigned long) to specific
integer types (uint16_t, uint_32_t and uint64_t).
2019-03-19 [r1972] Andrew M. Bishop <amb>
* src/optimiser.c: Fix bug with routes starting facing a dead-end
taking far too long to realise this (due to routing forward and
reverse at the same time).
2019-03-14 [r1970] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html, xml/routino-tagging.xml:
Add heuristics for deciding what transport types are allowed on a
ferry (based on patch from Melvin Vermeeren).
2019-03-13 [r1968] Andrew M. Bishop <amb>
* src/errorlog.c, src/nodes.c, src/nodesx.c, src/relations.c,
src/relationsx.c, src/waysx.c: Change binary search algorithm to
avoid index_t arithmetic overflow.
2018-11-19 [r1967] Andrew M. Bishop <amb>
* python/setup.py, python/test/run-one-test.sh: Update some
comments.
2018-11-14 [r1966] Andrew M. Bishop <amb>
* Makefile.conf, python/Makefile, python/README.txt,
python/database.py (added), python/setup.py,
python/src/database.cc (added), python/src/database.hh (added),
python/src/database.i (added), python/test/Makefile,
python/test/run-all-tests.sh (removed),
python/test/run-database-tests.sh (added),
python/test/run-router-tests.sh (added): Add a Python3 module to
access the data in the Routino database.
2018-11-08 [r1965] Andrew M. Bishop <amb>
* src/filedumper.c: Bug fix with filedumper program dumping plain
text version of a relation.
2018-10-31 [r1964] Andrew M. Bishop <amb>
* Makefile, python/Makefile, python/README.txt,
python/test/Makefile: Add the python directory to the top level
list. Print a warning if Python or Swig are not installed. Make
sure that running 'make' or 'make test' in the python directory
compiles the library and runs the main tests first.
2018-10-30 [r1963] Andrew M. Bishop <amb>
* Makefile.conf, extras/find-fixme/Makefile,
extras/statistics/Makefile, extras/tagmodifier/Makefile,
src/Makefile: Indent Makefiles.
2018-10-26 [r1962] Andrew M. Bishop <amb>
* python (added), python/Makefile (added), python/README.txt
(added), python/router.py (added), python/setup.py (added),
python/src (added), python/src/__init__.py (added),
python/src/router.i (added), python/test (added),
python/test/Makefile (added), python/test/run-all-tests.sh
(added), python/test/run-one-test.sh (added): Add a Python3
module that can access the Routino database and calculate routes.
Not compiled by default at the moment.
2018-10-26 [r1961] Andrew M. Bishop <amb>
* src/test, src/test/Makefile, src/test/a-b-c-d.sh,
src/test/a-b-c.sh, src/test/a-b.sh, src/test/cycle-drive.sh,
src/test/loop-and-reverse.sh, src/test/only-split.sh,
src/test/run-all-tests.sh (added), src/test/run-one-test.sh
(added), src/test/run-tests.sh (removed),
src/test/start-1-finish.sh: Update the routing test scripts
(refactor them, no change in the tests themselves).
2018-10-24 [r1960] Andrew M. Bishop <amb>
* Makefile.conf: Refer to 'clang' compiler by generic name and not
a specific version.
2018-10-23 [r1959] Andrew M. Bishop <amb>
* src/relationsx.c, src/sorting.h, src/waysx.c: Add extra checks to
ensure that the FILESORT_VARINT integer type does not overflow.
2018-09-25 [r1958] Andrew M. Bishop <amb>
* src/router+lib.c, src/router.c: Update some error messages for
consistency.
2018-09-21 [r1955-1956] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Use the 'prow_ref' tag instead of the
'ref' tag if it exists and 'ref' does not.
* xml/routino-tagging.xml: Add some more access tags after
reviewing errors from data processing.
2018-09-16 [r1954] Andrew M. Bishop <amb>
* src/osmparser.c: Add new parsing error message (turn relations
with multiple 'via).
2018-09-16 [r1952-1953] Andrew M. Bishop <amb>
* extras/errorlog/summarise-log.pl, src/osmparser.c,
src/relationsx.c: Add new parsing error messages (turn relations
with multiple 'from' or 'to'), improve the formatting of the
existing ones and improve the HTML log summary creation.
* extras/statistics/update.sh: Fix error with bogus path in script.
2018-08-09 [r1951] Andrew M. Bishop <amb>
* extras/README.txt: Update information about extra programs.
2018-07-28 [r1950] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-dumper.c, src/filedumper.c: Fix two
warnings found by gcc-8.
2018-06-15 [r1949] Andrew M. Bishop <amb>
* web/translations/router.html, web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Initialise the router map
web page with the search form for locations rather than
coordinates. Dragging a marker to the map converts it to
coordinates.
2018-06-15 [r1948] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Enable the search buttons
if two markers are placed by searching for a named location.
2018-04-23 [r1947] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html: An extra Perl module
needs to be required with new Perl versions.
2018-02-07 [r1946] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
web/translations/translation.es.txt,
web/translations/translation.ru.txt: Remove whitespace at the
ends of lines.
2018-02-07 [r1945] Andrew M. Bishop <amb>
* web/translations/translation.es.txt: Spanish translations updated
(via http://www.routino.org/translations/).
2018-01-13 [r1944] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: More German translations
(via http://www.routino.org/translations/).
2017-11-01 [r1943] Andrew M. Bishop <amb>
* src/sorting.c: Bug fix for race condition in multi-threaded
sorting algorithm.
2017-10-18 [r1942] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt,
xml/routino-translations.xml: Hungarian translations updated (via
http://www.routino.org/translations/).
2017-10-10 [r1941] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt: Final set of Hungarian
translations added, now complete (via
http://www.routino.org/translations/).
2017-10-09 [r1940] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt: More Hungarian translations
added (via http://www.routino.org/translations/).
2017-10-05 [r1939] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt: More Hungarian translations
added (via http://www.routino.org/translations/).
2017-10-03 [r1938] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt,
xml/routino-translations.xml: Completed the Hungarian translation
of the XML file and added lots more Hungarian web page
translations (all from Gábor Babos).
2017-09-23 [r1936-1937] Andrew M. Bishop <amb>
* web/translations/translation.es.txt (added), web/www/routino,
xml/routino-translations.xml: Added a Spanish translation of the
phrases in the routing outputs.
* Makefile.conf, doc/INSTALL.txt, doc/html/installation.html: Add
make options to compile with clang instead of gcc, without
fast-maths or with the gcc (or clang) sanitizer without editing
Makefile.conf.
2017-09-20 [r1935] Andrew M. Bishop <amb>
* extras/statistics/dumper.c, src/filedumperx.c, src/logging.h,
src/output.c, src/planetsplitter.c, src/queue.c, src/routino.c,
src/sorting.c, src/visualiser.c: Remove most of the warnings
found by the clang static analyser.
2017-09-20 [r1933-1934] Andrew M. Bishop <amb>
* Makefile.conf, src/osmo5mparse.c, src/xmlparse.c: Make it easier
to compile with clang instead of gcc (use CLANG=1 option to
'make'). Suppress compiler warnings from clang 5.0.
* src/xmlparse.c: Suppress compiler warning from gcc 7.2.
2017-09-17 [r1932] Andrew M. Bishop <amb>
* web/translations/translations-head.xml,
web/translations/visualiser.html: Update dates in header of
generated translation files.
2017-07-17 [r1931] Andrew M. Bishop <amb>
* web/translations/translation.fr.txt: Updated French translations
(via http://www.routino.org/translations/).
2017-07-12 [r1930] Andrew M. Bishop <amb>
* web/translations/translation.it.txt,
xml/routino-translations.xml: Updated an Italian translation (via
http://www.routino.org/translations/).
2017-07-08 [r1929] Andrew M. Bishop <amb>
* web/translations/translation.it.txt: Modified Italian
translations (via http://www.routino.org/translations/).
2017-06-29 [r1928] Andrew M. Bishop <amb>
* web/translations/translation.it.txt,
xml/routino-translations.xml: Updated Italian translations (via
http://www.routino.org/translations/).
2017-06-27 [r1927] Andrew M. Bishop <amb>
* web/translations/translation.it.txt,
xml/routino-translations.xml: More Italian translations (via
http://www.routino.org/translations/).
2017-06-25 [r1926] Andrew M. Bishop <amb>
* web/translations/translation.it.txt: Modified Italian
translations (via http://www.routino.org/translations/).
2017-06-23 [r1925] Andrew M. Bishop <amb>
* web/translations/translation.it.txt: More Italian translations
(via http://www.routino.org/translations/).
2017-06-21 [r1924] Andrew M. Bishop <amb>
* web/translations/translation.it.txt,
xml/routino-translations.xml: More Italian translations (via
http://www.routino.org/translations/).
2017-06-17 [r1923] Andrew M. Bishop <amb>
* web/translations/translation.it.txt (added), web/www/routino,
xml/routino-translations.xml: Added an Italian translation (via
http://www.routino.org/translations/).
2017-06-16 [r1921-1922] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Added another translated
German word (via http://www.routino.org/translations/).
* extras/find-fixme/Makefile, extras/statistics/Makefile,
extras/tagmodifier/Makefile, src/Makefile, src/xml/Makefile:
Change Makefile so that rules cannot fail when a parallel make is
run and attempts to create the .deps directory many times in
parallel.
2017-06-07 [r1919] Andrew M. Bishop <amb>
* src/optimiser.c: Fix bug with route calculation that may not give
optimum solution. Forward and reverse routes were not being
treated equally.
2017-04-26 [r1918] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Added more translated German
phrases (via http://www.routino.org/translations/).
2017-04-15 [r1917] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js: Update Javascript to handle
function that has been removed from Leaflet version 1.x.
2017-04-02 [r1916] Andrew M. Bishop <amb>
* web/www/leaflet/install.sh: Update to version 1.0.3 of Leaflet.
2017-03-31 [r1914-1915] Andrew M. Bishop <amb>
* web/www/routino/router.openlayers.js: Change zoom level when
clicking on a point in the route to the same with Openlayers as
with Leaflet.
* src/queue.c: Change 'int' to 'uint32_t'.
2017-03-29 [r1913] Andrew M. Bishop <amb>
* src/queue.c: Log the memory allocated in the queue data
structure.
2017-03-29 [r1912] Andrew M. Bishop <amb>
* src/results.c: Add a comment explaining the change of hash table.
2017-03-25 [r1911] Andrew M. Bishop <amb>
* src/results.c: Bug fix for modified hash - error in resizing
array only found with large dataset.
2017-03-25 [r1910] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Change the hash table for storing
the results from a chained linked list to a simple linear probing
method for handling collisions.
2017-03-25 [r1909] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Revert the previous change (was:
Remove an unused entry from the Results data structure) the
special case of ResetResultsList needs the two variables to be
separate.
2017-03-25 [r1906-1908] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Remove an unused entry from the
Results data structure.
* src/test/a-b-c-d.sh, src/test/a-b-c.sh, src/test/a-b.sh,
src/test/cycle-drive.sh, src/test/loop-and-reverse.sh,
src/test/only-split.sh, src/test/run-tests.sh,
src/test/start-1-finish.sh: Change the test scripts to make it
easier to enable and disable the use of valgrind for all tests.
* src/version.h: Update version number to reflect changes from
released version.
2017-03-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.
2016-03-06 [r1869] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
src/version.h: Update for version 3.1.1 release.
2016-03-05 Andrew M. Bishop <amb>
Version 3.1 released.
2016-03-05 [r1866] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update
for version 3.1 release.
2016-02-28 [r1865] Andrew M. Bishop <amb>
* src/typesx.h: Change node_t to a 64-bit type by default due to
the imminent OSM node number overflow with 32-bits.
2016-02-28 [r1865] Andrew M. Bishop <amb>
* src/typesx.h: Change node_t to a 64-bit type by default due to
the imminent OSM node number overflow with 32-bits.
2016-02-27 [r1864] Andrew M. Bishop <amb>
* src/xmlparse.c: Fix an XML parsing bug found by AFL.
2016-02-25 [r1863] Andrew M. Bishop <amb>
* Makefile.conf, src/segments.h, src/ways.h: Fix some changes found
with gcc sanitizer options.
2016-02-24 [r1857] Andrew M. Bishop <amb>
* src/optimiser.c: Change the FindMiddleRoute function so that it
routes from both ends towards the middle. This will make it much
quicker to detect some cases where a route is impossible but it
does slightly slow down normal operation.
2016-02-14 [r1856] Andrew M. Bishop <amb>
* extras/statistics (added), extras/statistics/Makefile (added),
extras/statistics/README.txt (added),
extras/statistics/create-basemap.pl (added),
extras/statistics/create-image.pl (added),
extras/statistics/dumper.c (added), extras/statistics/update.sh
(added): Add scripts that will process the Routino database and
generate maps with highway statistics.
2016-02-12 [r1855] Andrew M. Bishop <amb>
* extras/find-fixme/Makefile: Use '$(DEPDIR)' rather than '.deps'.
2016-01-05 [r1854] Andrew M. Bishop <amb>
* src/profiles.c: Remove a couple of lines of code with a literal
type conversion error. Add special checks that neither max_pref
or max_speed are zero.
2015-12-30 [r1852-1853] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/web/www/.htaccess (added),
web/www/routino/.htaccess: Update the instructions about setting
up Apache (tested on Apache 2.4.x).
* web/translations/translation.de.txt,
xml/routino-translations.xml: More German translations (via
http://www.routino.org/translations/).
2015-12-24 [r1851] Andrew M. Bishop <amb>
* src/optimiser.c: Remove a lookup in the FixForwardRoute function.
2015-12-21 [r1850] Andrew M. Bishop <amb>
* xml/routino-profiles.xml: Reduce the preference for service roads
when driving.
2015-12-21 [r1849] Andrew M. Bishop <amb>
* src/optimiser.c: Add an experimental (commented out) version of
the FindMiddleRoute function that finds the route in reverse
(starting at the end working back to the beginning). Verified to
give equivalent, if not identical, results to the existing
function.
2015-12-21 [r1848] Andrew M. Bishop <amb>
* src/optimiser.c: Simplify the way that the beginning of the route
is inserted into the results.
2015-12-18 [r1847] Andrew M. Bishop <amb>
* src/optimiser.c, src/results.h: Change the way that the beginning
of the route is used to seed the search for the super-route and
then to create the combined route.
2015-12-18 [r1846] Andrew M. Bishop <amb>
* src/optimiser.c, src/test/expected/super-or-not-WP01.txt,
src/test/expected/super-or-not-WP02.txt,
src/test/expected/super-or-not-WP03.txt,
src/test/expected/super-or-not-WP04.txt (added),
src/test/expected/super-or-not-WP05.txt (added),
src/test/super-or-not.osm: Fix a bug where the optimum end of the
route was not being used because the search was stopping at the
first super-node that was part of another possible end of the
route. Add to an existing test case.
2015-12-15 [r1845] Andrew M. Bishop <amb>
* src/optimiser.c: Improve the debug output (add debugging
information to the FindSuperSegment function).
2015-12-14 [r1844] Andrew M. Bishop <amb>
* src/optimiser.c: Improve the debug output (use a common function
for all of them and add more information).
2015-12-08 [r1843] Andrew M. Bishop <amb>
* src/optimiser.c: Rewrite FindFinishRoutes so that it does not
find node-segment pairs pointing in reverse and then reverse them
but find normal node-segment pairs working backwards.
2015-12-07 [r1842] Andrew M. Bishop <amb>
* src/optimiser.c: Fix bug in last change (FindFinishRoutes is not
the same as the other functions).
2015-12-05 [r1835] Andrew M. Bishop <amb>
* src/optimiser.c: Rename some variables, move some lines of code
around and extract some code into a separate function. Tidying
up, no functional change.
2015-12-01 [r1834] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: More German translations
(via http://www.routino.org/translations/).
2015-11-24 [r1833] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.html: Fix error in non-Javascript
version of statistics URL.
2015-10-24 [r1832] Andrew M. Bishop <amb>
* src/router.c: Fix routing bug where missing waypoint data still
gets routed.
2015-10-24 [r1831] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Store the home location
cookie with 5 decimal places. Fix the home marker icon jumping
about (Leaflet version).
2015-10-24 [r1830] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Print an error message if
the geolocation function fails or is unavailable.
2015-10-17 [r1828] Andrew M. Bishop <amb>
* src/routino.c, src/test/loop-and-reverse.sh: Fix test case for
loop and reverse and fix libroutino error that wasn't detected by
broken test case.
2015-10-12 [r1826-1827] Andrew M. Bishop <amb>
* src/test, src/test/expected/loop-and-reverse-WP-L.txt (added),
src/test/expected/loop-and-reverse-WP-LR.txt (added),
src/test/expected/loop-and-reverse-WP-R.txt (added),
src/test/expected/loop-and-reverse-WP.txt (added),
src/test/loop-and-reverse.osm (added),
src/test/loop-and-reverse.sh (added): Add a test case for the
loop and reverse route options.
* doc/LIBRARY.txt, doc/html/library.html, src/router+lib.c,
src/routino.c, src/routino.h: Add the loop and reverse route
options to the library. Increased the API version number.
2015-10-07 [r1824-1825] Andrew M. Bishop <amb>
* src/router+lib.c: Fix a bug with the change to handle reverse and
loop together.
* src/router.c: Simplify the ugly code for handling reverse and
loop better - more code, simpler to understand. Calculate all the
waypoints first and then use the points.
2015-09-30 [r1823] Andrew M. Bishop <amb>
* src/router+lib.c, src/router.c: When using --reverse and --loop
together start at the first waypoint specified rather than the
last one specified.
2015-09-30 [r1822] Andrew M. Bishop <amb>
* web/Makefile: Force the make not to be run in parallel in the web
directory.
2015-09-30 [r1821] Andrew M. Bishop <amb>
* web/translations/translation.fr.txt,
xml/routino-translations.xml: Add new and updated French
translations (via http://www.routino.org/translations/).
2015-09-29 [r1820] Andrew M. Bishop <amb>
* extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/xml/Makefile: Re-implement the change to allow using 'make -j
4'.
2015-09-29 [r1819] Andrew M. Bishop <amb>
* src/Makefile, web/Makefile: Re-implement the change to allow
using 'make -j 4'.
2015-09-28 [r1818] Andrew M. Bishop <amb>
* doc/LIBRARY.txt, doc/html/library.html, src/router+lib.c,
src/routino.c, src/routino.h: Include the version number of
Routino that was used to compile the library into the library as
a string variable.
2015-09-28 [r1817] Andrew M. Bishop <amb>
* src/router+lib.c, src/router.c: Make router.c and router+lib.c
more similar without changing the functionality.
2015-09-26 [r1815-1816] Andrew M. Bishop <amb>
* src/test/expected/coincident-waypoint-WP01.txt,
src/test/expected/coincident-waypoint-WP02.txt,
src/test/expected/coincident-waypoint-WP03.txt,
src/test/expected/coincident-waypoint-WP04.txt,
src/test/expected/cycle-both-ways-WP01.txt,
src/test/expected/cycle-both-ways-WP02.txt,
src/test/expected/dead-ends-WP01.txt,
src/test/expected/dead-ends-WP02.txt,
src/test/expected/dead-ends-WP03.txt,
src/test/expected/dead-ends-WP04.txt,
src/test/expected/dead-ends-WP05.txt,
src/test/expected/dead-ends-WP06.txt,
src/test/expected/dead-ends-WP07.txt,
src/test/expected/dead-ends-WP08.txt,
src/test/expected/dead-ends-WP09.txt,
src/test/expected/dead-ends-WP10.txt,
src/test/expected/dead-ends-WP11.txt,
src/test/expected/fake-node-with-loop-WP01.txt,
src/test/expected/fake-node-with-loop-WP02.txt,
src/test/expected/loops-WP01.txt,
src/test/expected/loops-WP02.txt,
src/test/expected/loops-WP03.txt,
src/test/expected/loops-WP04.txt,
src/test/expected/loops-WP05.txt,
src/test/expected/loops-WP06.txt,
src/test/expected/loops-WP07.txt,
src/test/expected/loops-WP08.txt,
src/test/expected/loops-WP09.txt,
src/test/expected/loops-WP10.txt,
src/test/expected/loops-WP11.txt,
src/test/expected/no-super-WP01.txt,
src/test/expected/no-super-WP02.txt,
src/test/expected/no-super-WP03.txt,
src/test/expected/no-super-WP04.txt,
src/test/expected/node-restrictions-WP01.txt,
src/test/expected/node-restrictions-WP02.txt,
src/test/expected/node-restrictions-WP03.txt,
src/test/expected/node-restrictions-WP04.txt,
src/test/expected/node-restrictions-WP05.txt,
src/test/expected/node-restrictions-WP06.txt,
src/test/expected/node-restrictions-WP07.txt,
src/test/expected/node-restrictions-WP08.txt,
src/test/expected/oneway-loop-WP01.txt,
src/test/expected/roundabout-waypoints-WP01.txt,
src/test/expected/roundabout-waypoints-WP02.txt,
src/test/expected/roundabout-waypoints-WP03.txt,
src/test/expected/roundabout-waypoints-WP04.txt,
src/test/expected/roundabout-waypoints-WP05.txt,
src/test/expected/roundabout-waypoints-WP06.txt,
src/test/expected/roundabout-waypoints-WP07.txt,
src/test/expected/super-or-not-WP01.txt,
src/test/expected/super-or-not-WP02.txt,
src/test/expected/super-or-not-WP03.txt,
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,
src/test/expected/turns-WP16.txt: Change test cases for the
changed output formats.
* src/output.c, src/translations.c, src/translations.h,
web/translations/translation.de.txt,
web/translations/translation.en.txt,
web/translations/translation.fr.txt,
web/translations/translation.hu.txt,
web/translations/translation.nl.txt,
web/translations/translation.pl.txt,
web/translations/translation.ru.txt,
web/translations/translations-body.xml,
xml/routino-translations.xml: Change file output formats so that
waypoint numbers are included. Change the names of the GPX route
waypoints in the XML file.
2015-09-26 [r1814] Andrew M. Bishop <amb>
* src/Makefile, src/test/Makefile: Fix makefiles so that 'make
test' works from a clean directory.
2015-09-26 [r1813] Andrew M. Bishop <amb>
* src/router+lib.c, src/router.c, web/translations/router.html,
web/www/routino/icons/waypoint-loop.png (added),
web/www/routino/icons/waypoint-reverse.png (added),
web/www/routino/router.css, web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js, web/www/routino/router.pl:
Add a loop and reverse checkbox on the web page and replace the
loop and reverse buttons with icons. Update router programs and
scripts.
2015-09-26 [r1812] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Fix bug with specifying
'oneway' or 'turns' in the URL arguments.
2015-09-24 [r1810] Andrew M. Bishop <amb>
* src/router+lib.c: Fix a bug with freeing the waypoints if routing
a loop.
2015-09-15 [r1804] Andrew M. Bishop <amb>
* extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/Makefile, src/xml/Makefile, web/Makefile: Fix Makefiles so
that 'make -j 4' works.
2015-09-15 [r1803] Andrew M. Bishop <amb>
* Makefile.conf, src/Makefile: Add a "SONAME" shared library
version number.
2015-09-15 [r1801-1802] Andrew M. Bishop <amb>
* src/version.h: Change the version number so that anybody using
the SVN version knows that it is not the released version and let
them take care about the exact version.
* src/Makefile: Don't create the *.so files on Windows.
2015-09-14 [r1799-1800] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Make the whole row of the
route clickable, not just the number on the left.
* doc/html/library.html: Give each HTML header a unique id.
2015-09-12 Andrew M. Bishop <amb>
Version 3.0 released.
2015-09-12 [r1798] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update
files for release.
2015-09-09 [r1797] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html, extras/find-fixme/README.txt,
extras/find-fixme/fixme-dumper.c,
extras/find-fixme/fixme-finder.c, extras/tagmodifier/README.txt,
extras/tagmodifier/tagmodifier.c, src/filedumper.c,
src/filedumperx.c, src/planetsplitter.c, src/router+lib.c,
src/router.c, src/version.h (added): Add a '--version' option to
all executables to print the current version (defined in
version.h).
2015-09-07 [r1796] Andrew M. Bishop <amb>
* src/output.c, src/translations.c,
web/translations/translation.de.txt,
web/translations/translation.en.txt,
web/translations/translation.fr.txt,
web/translations/translation.hu.txt,
web/translations/translation.nl.txt,
web/translations/translation.pl.txt,
web/translations/translation.ru.txt,
web/translations/translations-body.xml,
web/translations/translations-head.xml,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js,
xml/routino-translations.xml, xml/routino-translations.xsd: Merge
some of the translation phrases together to simplify them. Change
the HTML output and web pages to work with this.
2015-09-03 [r1795] Andrew M. Bishop <amb>
* doc/LIBRARY.txt, doc/html/library.html, src/output.c,
src/router+lib.c, src/routino.c, src/routino.h: Add in an
HTML-all linked list formats that includes the full set of points
and the HTML directions for the important ones.
2015-09-03 [r1794] Andrew M. Bishop <amb>
* src/router.c: Bug fix in usage information.
2015-08-17 [r1793] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Fix a bug with dragging a
marker from the left panel onto the map when the left panel has
scrolled the page.
2015-08-17 [r1792] Andrew M. Bishop <amb>
* doc/LIBRARY.txt, doc/html/library.html, src/router+lib.c,
src/routino.c, src/routino.h, src/translations.c,
src/translations.h: Add a new API function to return the full
names of the languages available in the translations XML file.
Increase API version to 6.
2015-08-17 [r1791] Andrew M. Bishop <amb>
* src/test/copyright.xml, src/translations.c, src/translations.h,
web/translations/translate.pl,
web/translations/translations-body.xml,
xml/routino-translations.xml, xml/routino-translations.xsd: Add
the long version of the language name to the XML translations
file.
2015-08-17 [r1790] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Replace one German word
(via http://www.routino.org/translations/).
2015-08-16 [r1789] Andrew M. Bishop <amb>
* web/translations/translate.pl,
web/translations/translation.pl.txt,
xml/routino-translations.xml: Delete some Polish documentation
strings that were incorrectly formed (not enough '%s').
2015-08-15 [r1788] Andrew M. Bishop <amb>
* doc/html/index.html, doc/html/installation-ms-windows.html,
doc/html/installation.html: Some small documentation tidying up.
2015-08-15 [r1787] Andrew M. Bishop <amb>
* extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/Makefile, src/xml/Makefile: Use $^ instead of $< in Makefiles
where it is simpler and where there are multiple dependencies
that all need to be used together.
2015-08-15 [r1786] Andrew M. Bishop <amb>
* src/test/Makefile: Compile the executables all in one go rather
than running make for each one.
2015-08-15 [r1785] Andrew M. Bishop <amb>
* Makefile, src/Makefile: Don't automatically choose the order in
which to enter the sub-directories but hard-code it to make it
more sensible.
2015-08-15 [r1784] Andrew M. Bishop <amb>
* Makefile.conf, doc/INSTALL-MS-WIN.txt, doc/LIBRARY.txt (added),
doc/html/index.html, doc/html/installation-ms-windows.html,
doc/html/library.html (added), extras/find-fixme/Makefile,
extras/find-fixme/fixme-dumper.c,
extras/find-fixme/fixme-finder.c, extras/find-fixme/osmparser.c,
extras/tagmodifier/Makefile, extras/tagmodifier/tagmodifier.c,
src, src/Makefile, src/errorlogx.c, src/fakes.c, src/fakes.h,
src/filedumper.c, src/filedumperx.c, src/files.c, src/files.h,
src/functions.h, src/logerror.c, src/nodes.c, src/nodesx.c,
src/optimiser.c, src/osmo5mparse.c, src/osmparser.c,
src/osmpbfparse.c, src/osmxmlparse.c, src/output.c,
src/planetsplitter.c, src/profiles.c, src/profiles.h,
src/relations.c, src/relationsx.c, src/relationsx.h,
src/results.c, src/router+lib.c (added), src/router.c,
src/routino.c (added), src/routino.h (added), src/segments.c,
src/segmentsx.c, src/superx.c, src/tagging.c, src/test,
src/test/Makefile, src/test/a-b-c-d.sh, src/test/a-b-c.sh,
src/test/a-b.sh, src/test/cycle-drive.sh, src/test/only-split.sh,
src/test/run-tests.sh (added), src/test/start-1-finish.sh,
src/translations.c, src/translations.h, src/types.c,
src/visualiser.c, src/ways.c, src/waysx.c, src/xml/Makefile,
src/xml/xsd-to-xmlparser.c, src/xmlparse.c, src/xmlparse.h,
web/Makefile, web/www/routino/documentation: Merge libroutino
branch back into the trunk.
2015-08-15 [r1783] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf, extras/find-fixme/Makefile,
extras/tagmodifier/Makefile, src/Makefile, src/test/Makefile,
src/xml/Makefile, web/Makefile: Add '.exe' to the EXE targets to
stop MinGW recompiling the executables each time.
2015-08-14 [r1782] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf, doc/INSTALL-MS-WIN.txt,
doc/html/installation-ms-windows.html,
extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/Makefile, web/Makefile: Fully automatic host detection (for
Cygwin, MinGW and generic UNIX).
2015-08-14 [r1781] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf, src/Makefile: Using 'make install' now installs
the libraries. On Windows installation uses 'Program
Files/Routino' as the base directory.
2015-08-14 [r1780] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
web/translations/translation.nl.txt,
web/translations/translation.ru.txt,
xml/routino-translations.xml: Remove duplicated words and
whitespace in translations.
2015-08-11 [r1779] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf: Don't include '-fPIC' for MinGW compilation (stops
some warnings).
2015-08-11 [r1776-1778] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/INSTALL-MS-WIN.txt, doc/html/installation-ms-windows.html:
Updated documentation for compiling with MinGW64 and compiling
library files.
* src/Makefile: An attempt at creating routino.def and routino.lib
using dlltool instead of gendef.
* src/files.c, src/files.h: Undefine some #defines that MinGW64
uses to remove lots of compiler warnings.
2015-08-10 [r1773-1775] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/Makefile: Create routino.dll and routino.def when compiling
with MinGW (based on suggestion from Oliver Eichler).
* src/router+lib.c: Use 'use_stdout' instead of 'stdout' as a
variable name (patch from Oliver Eichler).
* src/routino.h: Use DLL_PUBLIC for the extern definitions of the
global variables (patch from Oliver Eichler).
2015-08-08 [r1772] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/translations.c: Put the missing space back in the HTML
string.
2015-08-08 [r1771] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html, src/output.c,
src/router+lib.c, src/routino.c, src/routino.h,
src/translations.c, src/translations.h: Simplify the HTML
generation by making more complex format strings when parsing the
translations. Add another field to the API HTML format output
(cumulative distance). Increase API version to 5.
2015-08-08 [r1770] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html: Add some missing API
changes.
2015-08-08 [r1769] Andrew M. Bishop <amb>
* doc/OUTPUT.txt: Fix some text formatting problems.
2015-08-08 [r1768] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html, src/output.c,
src/router+lib.c, src/routino.c, src/routino.h,
src/translations.c, src/translations.h: Add a new output list
format that contains a text version of the normal HTML output.
Increase API version to 4.
2015-08-04 [r1767] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html, src/optimiser.c,
src/router+lib.c, src/routino.c, src/routino.h: Add a progress
callback that reports routing progress and can abort the routing
algorithm if required. Increase API version to 3.
2015-08-04 [r1766] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html, src/output.c,
src/routino.c, src/routino.h: Add speed for each route segment
(text-all version) and rename the 'string' parameter to 'name'.
Increase API version to 2.
2015-08-03 [r1765] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt, doc/html/library.html, src/router+lib.c,
src/routino.c, src/routino.h: Add a library API version number
#define and variable and a function to compare the two.
2015-08-03 [r1764] Andrew M. Bishop <amb> (from 'branches/libroutino')
* web/www/routino/documentation: Ignore the library documentation
when copied to the web directory.
2015-08-03 [r1763] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Format the web links to
only use 5 decimal places.
2015-08-02 [r1761-1762] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/output.c: Another fix for a mistake in output generation.
* src/output.c: Patch from Oliver Eichler for some mistakes in
output generation.
2015-07-31 [r1760] Andrew M. Bishop <amb> (from 'branches/libroutino')
* doc/LIBRARY.txt (added), doc/html/index.html,
doc/html/library.html (added), src/routino.c, src/routino.h:
Documentation for the libroutino library.
2015-07-31 [r1759] Andrew M. Bishop <amb>
* web/translations/translation.pl.txt: More Polish translations
(via http://www.routino.org/translations/).
2015-07-30 [r1758] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/functions.h, src/output.c, src/router+lib.c, src/router.c,
src/routino.c, src/routino.h: Add the ability to request a linked
list output representing the route when using the routino
library.
2015-07-21 [r1757] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/routino.c, src/routino.h: Add a user profile type and
functions to convert it to and from the Routino profile.
2015-07-20 [r1756] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/router+lib.c, src/router.c, src/routino.c, src/routino.h: Add
options to the routing function to allow selection of the type of
output files generated.
2015-07-20 [r1755] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/profiles.c, src/profiles.h, src/router+lib.c, src/routino.c,
src/routino.h, src/translations.c, src/translations.h: Add
functions to the library to return the list of loaded translation
languages and profile names.
2015-07-20 [r1754] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf, src/Makefile: Compile the version of the router
using libroutino to search for the shared library in the same
directory.
2015-07-20 [r1753] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/routino.c, src/routino.h: Check for validated profiles before
using them.
2015-07-18 [r1752] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/test/Makefile, src/test/run-tests.sh (added): Put the test
script execution into a script.
2015-07-18 [r1751] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/test, src/test/Makefile, src/test/a-b-c-d.sh,
src/test/a-b-c.sh, src/test/a-b.sh, src/test/cycle-drive.sh,
src/test/only-split.sh, src/test/start-1-finish.sh: Add tests of
the router built with libroutino.
2015-07-16 [r1750] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/router+lib.c: Fix bug in last check-in.
2015-07-16 [r1749] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/router+lib.c, src/router.c, src/routino.c,
src/translations.c: Allow choosing a named translation, the first
in the file or the built-in English one. Make the routers use the
first in the file if no language is specified rather than the
built-in one.
2015-07-16 [r1748] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/profiles.c, src/profiles.h, src/router+lib.c, src/router.c,
src/routino.c, src/routino.h: Validate profile parameters better
when reading XML or router command line. Change the Profile data
structure so that UpdateProfile() does not change the parts that
are loaded from file so that it can be used multiple times on the
same profile. Change the highway and props data to be between 0
and 1 rather than a percentage. Add a new function to the library
to validate a profile and also update it.
2015-07-15 [r1746-1747] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/profiles.c, src/routino.c, src/routino.h, src/translations.c:
Add a Routino_errno variable that indicates the error status of
the most recent library function called.
* src/Makefile: Fix bug with Makefile dependencies for
libroutino.so and libroutino-slim.so.
2015-07-14 [r1745] Andrew M. Bishop <amb>
* src/files.c, src/files.h: Merge changes from MS-Windows branch
(changes for stati64/fstati64/lseeki64).
2015-07-14 [r1743] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/files.c, src/files.h: Fix changes for
stati64/fstati64/lseeki64.
2015-07-11 [r1741] Andrew M. Bishop <amb>
* src/cache.h, src/errorlog.h, src/errorlogx.c, src/files.c,
src/files.h, src/logerror.c, src/nodes.c, src/nodes.h,
src/nodesx.c, src/relations.h, src/relationsx.c,
src/relationsx.h, src/ways.h, src/waysx.c, src/waysx.h: Merge
change from MS-Windows branch (offset_t).
2015-07-11 [r1740] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/cache.h, src/errorlog.h, src/errorlogx.c, src/files.c,
src/files.h, src/logerror.c, src/nodes.c, src/nodes.h,
src/nodesx.c, src/relations.h, src/relationsx.c,
src/relationsx.h, src/ways.h, src/waysx.c, src/waysx.h: Define a
custom type for the offset within a file (because MS Windows can
create a 4GB file but only seek +/-2GB within it).
2015-07-10 [r1739] Andrew M. Bishop <amb>
* src/nodes.h, src/nodesx.h, src/relations.h, src/segments.h,
src/segmentsx.h, src/ways.h, src/waysx.h: Clarify the comments
surrounding the definition of the slim mode cache data
structures.
2015-07-09 [r1738] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src, src/Makefile, src/router+lib.c (added), src/routino.c,
src/routino.h: Update the library and include a version of the
router program that uses the libroutino shared library for
calculating routes. Currently generates output files of all types
and accepts but ignores all options to change this.
2015-07-08 [r1737] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/translations.c: Bug fix when freeing the loaded translations.
2015-07-08 [r1736] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/translations.c: Bug fix for change introduced into xmlparse.c
by r1701.
2015-07-08 [1735] Andrew M. Bishop <amb>
* src/files.c: Merge change from MS-Windows branch.
2015-07-08 [r1734] Andrew M. Bishop <amb>
* src/xmlparse.c: Remove a commented out line left over from a
previous change.
2015-07-08 [r1733] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/files.c: Use the same definition of ssize_t in files.c as
other files (for MS Windows).
2015-07-07 [r1732] Andrew M. Bishop <amb>
* web/translations/translation.pl.txt: More Polish translations
(via http://www.routino.org/translations/).
2015-07-06 [r1731] Andrew M. Bishop <amb>
* web/translations/translation.pl.txt (added), web/www/routino,
web/www/routino/.htaccess, xml/routino-translations.xml: Added
Polish version of translations (submitted through
http://www.routino.org/translations/).
2015-07-04 [r1730] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/functions.h, src/optimiser.c, src/router.c: Move the
CalculateRoute function from router.c into optimiser.c.
2015-07-02 [r1729] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/functions.h, src/output.c, src/profiles.c, src/profiles.h,
src/router.c, src/translations.c, src/translations.h: Identify
the best bits from the profiles XML reader and translations XML
reader functions and implement them in both.
2015-07-02 [r1728] Andrew M. Bishop <amb>
* src/profiles.c: Fix error with --help-profile-xml option.
2015-07-01 [r1726] Andrew M. Bishop <amb>
* src/files.c, src/files.h, src/osmo5mparse.c, src/osmpbfparse.c,
src/xmlparse.c: Merge changes from MS-Windows branch.
2015-07-01 [r1724-1725] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/files.c: More fixes for MSVC, set permission for creating
files and combine code with MinGW.
* src/files.h, src/osmo5mparse.c, src/osmpbfparse.c,
src/xmlparse.c: More fixes for MSVC from Oliver Eichler (include
basestd.h and define ssize_t).
2015-06-22 [r1723] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/optimiser.c: Bug fix for latest change (logassert and
LIBROUTINO).
2015-06-22 [r1722] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/files.c, src/nodes.c, src/optimiser.c, src/relations.c,
src/results.c, src/segments.c, src/ways.c: Remove all references
to log_memory(), log_free(), log_mmap(), log_munmap() and
logassert() from code compiled into the library.
2015-06-20 [r1720] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/routino.h: Avoid defining DLL_PUBLIC twice on Cygwin.
2015-06-20 [r1719] Andrew M. Bishop <amb>
* extras/tagmodifier/tagmodifier.c, src/osmxmlparse.c,
src/profiles.c, src/tagging.c, src/translations.c,
src/xml/xsd-to-xmlparser.c, src/xmlparse.c, src/xmlparse.h: Make
the xmltags definitions of XML files be constants.
2015-06-20 [r1717-1718] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/xmlparse.c, src/xmlparse.h: Don't print an error when XML
parsing fails but store a string for later use (for use within
library version).
* src/optimiser.c: Check for defined(LIBROUTINO) instead of
LIBROUTINO.
2015-06-19 [r1716] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/files.c, src/optimiser.c, src/output.c, src/profiles.c,
src/translations.c: Do not print error or debug messages when
compiled into library. Return an appropriate error value from
functions instead of exiting.
2015-06-18 [r1715] Andrew M. Bishop <amb> (from 'branches/libroutino')
* Makefile.conf, src/Makefile, src/routino.c (added), src/routino.h
(added): Add stub files for Routino library exported functions
and Makefile support.
2015-06-17 [r1713] Andrew M. Bishop <amb>
* extras/tagmodifier/README.txt, extras/tagmodifier/tagmodifier.c:
Add the '--logmemory' option that the other programs have.
2015-06-17 [r1712] Andrew M. Bishop <amb> (from 'branches/libroutino')
* extras/find-fixme/fixme-finder.c: Fix error with command line
tagging filename selection. Change code to make it clearer that
the error log file is not optional.
2015-06-16 [r1711] Andrew M. Bishop <amb> (from 'branches/libroutino')
* extras/find-fixme/osmparser.c, extras/tagmodifier/tagmodifier.c,
src/errorlogx.c, src/fakes.c, src/fakes.h, src/logerror.c,
src/nodesx.c, src/osmo5mparse.c, src/osmparser.c,
src/osmpbfparse.c, src/osmxmlparse.c, src/profiles.c,
src/relationsx.c, src/segmentsx.c, src/tagging.c,
src/translations.c, src/visualiser.c, src/waysx.c,
src/xmlparse.c: Audit the use of file static variables to make
sure that there are no implicit assumptions about initialisation
conditions that would be wrong for library usage. Fix problems
and add comments for clarity.
2015-06-14 [r1710] Andrew M. Bishop <amb> (from 'branches/libroutino')
* extras/find-fixme/fixme-dumper.c,
extras/tagmodifier/tagmodifier.c, src/filedumper.c, src/nodesx.c,
src/osmxmlparse.c, src/planetsplitter.c, src/relationsx.c,
src/relationsx.h, src/segmentsx.c, src/superx.c, src/tagging.c,
src/translations.c, src/types.c, src/waysx.c,
src/xml/xsd-to-xmlparser.c, src/xmlparse.c: Audit the use of
function static variables to make sure that there are no implicit
assumptions about initialisation conditions that would be wrong
for library usage. Fix problems and add comments for clarity.
2015-06-12 [r1709] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/filedumperx.c: Correct an error in a comment.
2015-06-12 [r1708] Andrew M. Bishop <amb> (from 'branches/libroutino')
* extras/find-fixme/fixme-finder.c, src/planetsplitter.c,
src/router.c: Minimise the number of times that FileName() is
called since each one will allocate memory and take time.
2015-06-12 [r1706-1707] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/profiles.c, src/profiles.h, src/router.c: Add a function to
free the memory in the Profile structures loaded from file.
* src/output.c, src/router.c, src/translations.c,
src/translations.h: Create a Translation structure to hold the
translated strings and have one global variable instead of 30.
Add a function to free the memory in the Translation structure.
2015-06-10 [r1705] Andrew M. Bishop <amb>
* doc/html/index.html, web/www/routino/documentation: Merge the
MS-Windows branch back into the trunk. More documentation
changes.
2015-06-10 [r1704] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* doc/html/index.html: Update the index to point to the new MS
Windows installation documentation.
2015-06-10 [r1703] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* web/www/routino/documentation: Ignore the new MS Windows
installation documentation file.
2015-06-10 [r1701-1702] Andrew M. Bishop <amb> (from 'branches/libroutino')
* src/router.c: The translations are required to be loaded for the
text output formats.
* src/output.c, src/xmlparse.c: The ParseXML_Encode_Safe_XML()
function now returns a pointer to the same re-allocated string
each time rather than allocating a new string each time that it
is called.
2015-06-09 [r1699] Andrew M. Bishop <amb>
* Makefile.conf, doc/INSTALL-MS-WIN.txt (added), doc/INSTALL.txt,
doc/html/installation-ms-windows.html (added),
doc/html/installation.html, extras/find-fixme/Makefile,
extras/tagmodifier/Makefile, src/Makefile, src/errorlogx.c,
src/files.c, src/files.h, src/logerror.c, src/nodesx.c,
src/output.c, src/relationsx.c, src/segmentsx.c,
src/test/Makefile, src/uncompress.c, src/waysx.c,
src/xml/Makefile, src/xmlparse.c, web/Makefile: Merge the
MS-Windows branch back into the trunk. Code changes and
documentation for Cygwin and MinGW compilers.
2015-05-31 [r1697] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/errorlogx.c, src/files.c, src/files.h, src/nodesx.c,
src/relationsx.c, src/segmentsx.c, src/waysx.c: Microsoft Windows
does not allow deleting an open file and continuing to use it
like UNIX does. For MS Windows rename the file instead of
deleting and replacing it and do not delete open files
immediately but wait until they are closed.
2015-05-30 [r1696] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/files.c, src/logerror.c, src/output.c: Open files in binary
mode for MSVC and MinGW.
2015-05-29 [r1695] Andrew M. Bishop <amb>
* src/nodesx.c, src/relationsx.c, src/segmentsx.c, src/waysx.c:
Ensure that allocated strings are long enough even if the %p
format is extravagant in the number of characters it uses.
2015-05-29 [r1694] Andrew M. Bishop <amb>
* web/Makefile: Change the order so that the translations are
created before the icons (because the icons are more difficult to
make and more likely to fail).
2015-05-29 [r1693] Andrew M. Bishop <amb>
* Makefile.conf: Remove the -Wfloat-conversion gcc option since it
was only included in gcc version 4.9 so is not available
everywhere.
2015-05-29 [r1692] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* doc/INSTALL-MS-WIN.txt, doc/html/installation-ms-windows.html:
Add instructions for compiling with Cygwin (no source code
changes needed).
2015-05-28 [r1690] Andrew M. Bishop <amb>
* extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/Makefile, src/test/Makefile, src/xml/Makefile, web/Makefile,
web/www/routino, web/www/routino/router.html (removed),
web/www/routino/visualiser.html (removed), xml/Makefile: Update
Makefiles so that 'make clean' goes back to the source code in
the release tar files and 'make distclean' goes back to the
source code in subversion (the difference mainly being web page
icons and web page translations).
2015-05-28 [r1687-1689] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* doc/INSTALL-MS-WIN.txt (added), doc/INSTALL.txt,
doc/html/installation-ms-windows.html (added),
doc/html/installation.html: Update documentation to describe
compilation on Microsoft Windows.
* src/uncompress.c: Do not try to compile the built-in file
decompression on MINGW or MSVC due to the lack of fork()
function.
* Makefile.conf, extras/find-fixme/Makefile,
extras/tagmodifier/Makefile, src/Makefile, src/xml/Makefile,
web/Makefile: Update Makefiles for compiling with MINGW to
include mman-win32.o and handle executables with .exe file
extension.
2015-05-26 [r1683-1686] Andrew M. Bishop <amb> (from 'branches/MS-Windows')
* src/xmlparse.c: When compiling with MINGW there is no
strcasecmp() function so _stricmp() must be used (the same as
with MSVC).
* src/files.c: When compiling with MINGW the same mman-win32
functions are required as with MSVC. The open() function can not
set the 'group' and 'other' permissions although it can set the
'user' permissions.
* src/files.h: When compiling with MINGW the pread() and pwrite()
functions are not available. Fix a signed/unsigned assignment
warning in the inline functions.
* src/uncompress.c: Only compile the pipe_and_fork() function if
any of the compression methods are enabled.
2015-05-26 [r1680] Andrew M. Bishop <amb>
* Makefile.conf, extras/find-fixme/fixme-dumper.c,
extras/find-fixme/fixme-finder.c,
extras/tagmodifier/tagmodifier.c, src/Makefile, src/cache.h,
src/fakes.c, src/filedumper.c, src/files.c, src/files.h,
src/logging.c, src/logging.h, src/mman-win32.c (added),
src/mman-win32.h (added), src/nodes.c, src/optimiser.c,
src/osmo5mparse.c, src/osmpbfparse.c, src/output.c,
src/planetsplitter.c, src/profiles.c, src/router.c,
src/segments.h, src/uncompress.c, src/ways.c, src/ways.h,
src/xml/xsd-to-xmlparser.c, src/xmlparse.c: Merge branch 'MSVC'
back into the trunk.
2015-05-26 [r1679] Andrew M. Bishop <amb>
* web/www/leaflet/install.sh: Update to Leaflet version 0.7.3.
2015-05-21 [r1678] Andrew M. Bishop <amb>
* src/sorting.c: Fix bug with 64-bit version failing 'make test'.
2015-05-20 [r1677] Andrew M. Bishop <amb>
* src/output.c: Change a static variable to a const to clarify it
usage.
2015-05-20 [r1676] Andrew M. Bishop <amb> (from 'branches/MSVC')
* Makefile.conf: Add the -Wfloat-conversion gcc option to catch any
future score_t related conversions required.
2015-05-20 [r1675] Andrew M. Bishop <amb> (from 'branches/MSVC')
* src/optimiser.c, src/profiles.c, src/router.c: Typecasts for
score_t and explicit float (not double) literals for MSVC
compilation [based on patch from Oliver Eichler].
2015-05-20 [r1674] Andrew M. Bishop <amb> (from 'branches/MSVC')
* src/logging.c, src/xmlparse.c: Updated MSVC code changes after
testing [patch from Oliver Eichler].
2015-05-20 [r1673] Andrew M. Bishop <amb> (from 'branches/MSVC')
* src/files.c, src/files.h, src/mman-win32.c (added),
src/mman-win32.h (added): Added a Win32 implementation of the
mmap/munmap functions [files from
https://code.google.com/p/mman-win32 suggested by Oliver
Eichler].
2015-05-19 [r1666-1671] Andrew M. Bishop <amb> (from 'branches/MSVC')
* src/ways.c: Fix uninitialised memory [found by Oliver Eichler
when compiling with Microsoft C compiler].
* src/fakes.c, src/segments.h, src/ways.h: Add some explicit casts
for some assignments resulting from pointer arithmetic [patch
from Oliver Eichler for compiling with Microsoft C].
* src/files.c, src/nodes.c, src/xmlparse.c: Add some explicit casts
for some assignments between different integer types [patch from
Oliver Eichler for compiling with Microsoft C].
* src/Makefile, src/planetsplitter.c, src/router.c: Rename DATADIR
to ROUTINO_DATADIR to avoid problems when compiling with
Microsoft C compiler [inspired by patches from Oliver Eichler].
* src/files.c, src/files.h: Remove memory mapping functions when
compiling with Microsoft C compiler [inspired by patches from
Oliver Eichler]. This will only allow slim more to be compiled.
* src/xmlparse.c: Remove <strings.h> when compiling with Microsoft
C compiler (in which use a macro to replace strcasecmp) [inspired
by patches from Oliver Eichler].
2015-05-19 [r1664-1665] Andrew M. Bishop <amb> (from 'branches/MSVC')
* src/files.c, src/files.h: Remove <unistd.h> where not needed at
all or when compiling with Microsoft C compiler (in which case
add <io.h> and some macros to replace read/write/open/close/lseek
etc.) [inspired by patches from Oliver Eichler].
* extras/find-fixme/fixme-finder.c,
extras/tagmodifier/tagmodifier.c, src/cache.h, src/osmo5mparse.c,
src/osmpbfparse.c, src/output.c, src/planetsplitter.c,
src/uncompress.c, src/xml/xsd-to-xmlparser.c, src/xmlparse.c:
Remove <unistd.h> where not needed at all or when compiling with
Microsoft C compiler (in which case add <io.h> and some macros to
replace read/write/open/close/lseek etc.) [inspired by patches
from Oliver Eichler].
2015-05-19 [r1663] Andrew M. Bishop <amb> (from 'branches/MSVC')
* extras/find-fixme/fixme-dumper.c, src/filedumper.c,
src/logging.c, src/logging.h: Remove <sys/time.h> where not
needed at all or when compiling with Microsoft C compiler (in
which case add a replacement gettimeofday function) [inspired by
patches from Oliver Eichler].
2015-05-18 [r1661] Andrew M. Bishop <amb>
* src/optimiser.c: Fix use-after-free error found by valgrind.
2015-05-16 [r1657] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Fix bug with moving markers
on the map (OpenLayers version) and enable markers when they are
dragged onto the map (both versions).
2015-05-16 [r1656] Andrew M. Bishop <amb>
* web/translations/router.html,
web/translations/translation.de.txt,
web/translations/translation.en.txt,
web/translations/translation.fr.txt,
web/translations/translation.nl.txt, web/www/routino/router.css,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Allow dragging the waypoint
icon up-and-down in the list and onto the map.
2015-05-15 [r1655] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt: Add updated Hungarian
translations submitted via http://www.routino.org/translations/
on 2015-05-14.
2015-05-14 [r1652-1653] Andrew M. Bishop <amb>
* Makefile.conf: Add the -pedantic compilation flag to allow
detection of more potential errors and portability issues.
* src/errorlog.h, src/files.c, src/nodes.h, src/relations.h,
src/segments.h, src/sorting.c, src/ways.h: Replace all arithmetic
involving 'void*' pointers with 'char*' since it isn't strictly
valid although it is accepted by gcc.
2015-05-13 [r1651] Andrew M. Bishop <amb>
* src/xmlparse.c: Remove a gcc warning about overflow in implicit
constant conversion (by making it an explicit type cast).
2015-05-13 [r1650] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-dumper.c, src/filedumper.c,
src/logging.c: Use "%zu" to print 'size_t' type values and use
Pindex_t to print 'index_t' type values.
2015-05-13 [r1649] Andrew M. Bishop <amb>
* src/sorting.c: Remove some pthread related code that was being
used even if compiled without pthreads.
2015-05-05 [r1648] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translations submitted via http://www.routino.org/translations/
on 2015-05-04.
2015-05-01 [r1646] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/html/configuration.html,
doc/html/data.html, doc/html/index.html,
doc/html/installation.html, doc/html/limits.html,
doc/html/output.html, doc/html/readme.html, doc/html/style.css,
doc/html/tagging.html, doc/html/usage.html,
extras/find-fixme/web/www/index.html, web/www/routino/index.html:
Add "meta" header to HTML to help mobile devices and tidy up some
CSS.
2015-05-01 [r1644-1645] Andrew M. Bishop <amb>
* doc/html/readme.html: Fixed some header links.
* doc/TAGGING.txt, doc/html/tagging.html: Fixed some text
formatting.
2015-04-26 [r1643] Andrew M. Bishop <amb>
* web/translations/translation.hu.txt (added), web/www/routino,
xml/routino-translations.xml: Added a Hungarian translation of
the Routino routes and router web pages (from unknown person
using http://routino.org/translations/).
2015-04-11 [r1642] Andrew M. Bishop <amb>
* web/Makefile: Run make in the xml directory after updating the
xml/translations.xml file.
2015-04-10 [r1641] Andrew M. Bishop <amb>
* src/translations.c: Change built-in default HTML translation
strings so that they work with the web page if they have to be
used.
2015-03-30 [r1638] Andrew M. Bishop <amb>
* src/optimiser.c: Fix bug with indenting of debug output in
FindMiddleRoute() function.
2015-03-28 [r1636] Andrew M. Bishop <amb>
* src/optimiser.c: More verbose, consistent, complete and
descriptive debugging of routes found.
2015-03-28 [r1634] Andrew M. Bishop <amb>
* src/optimiser.c: The new FindStartRoutes() function does not need
to be so complicated.
2015-03-28 [r1632] Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/router.c: Remove the
ExtendStartRoutes() function by merging its functionality with
the FindStartRoutes() function since they were almost identical
anyway.
2015-03-21 [r1626-1627] Andrew M. Bishop <amb>
* src/optimiser.c, src/router.c: Make sure that all complete routes
have finish_node and last_segment filled in.
* src/optimiser.c: Bug fix and clarification for previous change.
2015-03-21 [r1625] Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/router.c: Don't merge the
end of the route with the middle part of the route before
combining with the beginning of the route - combine beginning,
middle and end all in one function.
2015-02-02 [r1624] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
xml/routino-translations.xml: Add updated German translations
submitted via http://www.routino.org/translations/ on 2014-01-31.
2015-01-17 [r1623] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
xml/routino-translations.xml: Add updated German translations
submitted via http://www.routino.org/translations/ on 2014-01-16.
2015-01-13 [r1622] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translations submitted via http://www.routino.org/translations/
on 2014-01-13.
2015-01-09 [r1621] Andrew M. Bishop <amb>
* web/translations/translation.nl.txt: Add updated Dutch
translations submitted via http://www.routino.org/translations/
on 2014-01-08.
2015-01-07 [r1620] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Remove cycle_barrier and bicycle_barrier
since these don't always block bicycles.
2014-12-04 [r1619] Andrew M. Bishop <amb>
* src/typesx.h: Increase MAX_SEG_PER_NODE to avoid further
problems.
2014-11-29 [r1618] Andrew M. Bishop <amb>
* src/visualiser.c: Include typesx.h to get the definition of
MAX_SEG_PER_NODE rather than having another one.
2014-11-08 Andrew M. Bishop <amb>
Version 2.7.3 released.
2014-11-08 [r1616] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html:
Updated for version 2.7.3.
2014-11-08 [r1615] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
xml/routino-translations.xml: Translation of the final German
word missing from the XML file.
2014-10-25 [r1614] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/nodesx.c, src/planetsplitter.c,
src/relationsx.c: Sort the data geographically before pruning so
that the data points physically close together are close together
in memory which reduces swapping/paging and therefore runs much
faster when memory is limited.
2014-10-23 [r1613] Andrew M. Bishop <amb>
* src/logging.c: Comment fixes, tidy-up and one bug fixed.
2014-10-22 [r1612] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/waysx.c: Use the waysx->idata array instead
of wayx->id when logging node errors during the segment creation.
2014-10-21 [r1609-1611] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Correct errors in wayx->id usage when
compacting ways.
* src/logging.c: Improve the message printed at the end when using
--logtime or --logmemory.
* src/planetsplitter.c: Clarify some comments.
2014-10-18 [r1608] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/segmentsx.c: Use the waysx->idata array
when logging duplicate segments rather than looking up the wayx
and using its id, also saves mapping the ways into memory.
2014-10-18 [r1606-1607] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/segmentsx.c: Use the nodesx->idata array
when logging duplicate segments rather than looking up the nodex
and using its id.
* src/nodesx.c: Shrink the size of the nodesx->idata array when
removing non-highway nodes.
2014-10-18 [r1605] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/nodesx.c, src/planetsplitter.c,
src/relationsx.c, src/segmentsx.c, src/superx.c: Free memory that
it allocated by IndexSegments() when no longer needed rather than
holding on to it.
2014-10-14 [r1604] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/planetsplitter.c: Speed up the database
generation when pruning by reducing the amount of random memory
accesses are required by compacting the database after each step.
Unless there is enough RAM to hold all the memory mapped files
this should be faster.
2014-10-13 [r1603] Andrew M. Bishop <amb>
* src/nodes.c, src/segments.c, src/segments.h, src/segmentsx.c: Try
to speed up the search for the closest node/segment by minimising
the number of nodes that are examined in detail.
2014-10-10 [r1602] Andrew M. Bishop <amb>
* src/nodes.c, src/relations.c, src/segments.c, src/ways.c: Record
the memory used by the node, segment, way and relation caches in
the slim mode router.
2014-10-10 [r1601] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-finder.c, src/logging.c,
src/planetsplitter.c, src/router.c: Log the router time in
microseconds rather than milliseconds. Add a note at the end
about the format of the time and memory logging.
2014-10-10 [r1600] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html, src/logging.c, src/nodes.c,
src/optimiser.c, src/results.c, src/router.c: Add the '--logtime'
and '--logmemory' options to the router to report the time and
maximum memory in use (allocated and mapped files) during each
step of the routing.
2014-09-30 [r1599] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-dumper.c,
extras/find-fixme/fixme-finder.c,
extras/tagmodifier/tagmodifier.c, src/filedumper.c,
src/filedumperx.c, src/planetsplitter.c, src/router.c: Use exit()
when exiting the program other than at the end of the main
function.
2014-09-27 [r1598] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, doc/USAGE.txt, doc/html/usage.html,
extras/find-fixme/README.txt, extras/find-fixme/fixme-finder.c,
src/errorlogx.c, src/files.c, src/logging.c, src/logging.h,
src/nodesx.c, src/planetsplitter.c, src/prunex.c,
src/relationsx.c, src/segmentsx.c, src/sorting.c, src/superx.c,
src/typesx.h, src/waysx.c: Add a '--logmemory' option to
planetsplitter which will report the maximum memory in use
(allocated and mapped files) during each step of the processing.
2014-09-27 [r1597] Andrew M. Bishop <amb>
* src/nodes.h, src/relations.c, src/segments.c, src/ways.c,
src/waysx.h: Be more consistent in the way that cache.h is
included.
2014-09-26 [r1596] Andrew M. Bishop <amb>
* src/logging.c, src/logging.h: Make a function static in logging.c
rather than global.
2014-09-26 [r1592-1595] Andrew M. Bishop <amb>
* src/planetsplitter.c: Free the segment list before generating the
errorlog files (it isn't used).
* src/prunex.c: Change a comment and the style in which some data
is freed.
* src/segmentsx.c: Free segmentsx->usedway in FreeSegmentList()
rather than letting it leak.
* src/nodesx.c: Free segmentsx->firstnode in SaveNodeList() like
DATALIFE.txt says it should be.
2014-09-23 [r1591] Andrew M. Bishop <amb>
* src/files.c, src/files.h, src/sorting.c: Allocate only the memory
that is needed (but never more than the limit) when sorting files
(i.e. don't just allocate the limit without checking).
2014-09-18 [r1589-1590] Andrew M. Bishop <amb>
* src/visualiser.c: Update comments for the functions (some were
wrong, all were unclear).
* extras/find-fixme/osmparser.c: Remove unused macros.
2014-08-27 [r1588] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translation submitted via http://www.routino.org/translations/ on
2014-08-26.
2014-07-26 [r1587] Andrew M. Bishop <amb>
* src/profiles.c: Limit the property preferences to a factor of 100
preference for a highway having a property compared to a highway
not having the property (was 10000).
2014-07-04 [r1586] Andrew M. Bishop <amb>
* doc/NEWS.txt: Fix release date for 2.7.2.
2014-06-26 Andrew M. Bishop <amb>
Version 2.7.2 released.
2014-06-26 [r1584] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html:
Updated for version 2.7.2 release.
2014-06-25 [r1583] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html: Add a note about
another Perl module required if compiling from subversion.
2014-06-25 [r1582] Andrew M. Bishop <amb>
* src/router.c: Clarify the reason for the unreachable code (#if 0)
and fix bug in it.
2014-06-25 [r1581] Andrew M. Bishop <amb>
* src/errorlogx.c: Fix for compiler warning on 64-bit systems but
not 32-bit systems.
2014-06-24 [r1580] Andrew M. Bishop <amb>
* src/output.c: Fix for revision r1565 that crashes on 64-bit
systems but not 32-bit systems.
2014-06-24 [r1579] Andrew M. Bishop <amb>
* src/optimiser.c: Fix for revision r1553 that crashes on 64-bit
systems but not 32-bit systems.
2014-06-09 [r1578] Andrew M. Bishop <amb>
* src/cache.h: Increase the size of the caches for the slim
programs by a factor of four (gives a large speed-up on virtual
machines with low memory and slow disks even though it makes
little difference on machines with lots of memory and fast
disks).
2014-06-07 [r1577] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Document the default
assumptions about allowed transport types on ferry routes (none).
2014-06-05 [r1576] Andrew M. Bishop <amb>
* web/translations/translate.pl: When creating the translated HTML
and XML files give the statistics for each file separately.
2014-05-26 [r1575] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translations submitted via http://www.routino.org/translations/
on 2014-05-25.
2014-05-21 [r1574] Andrew M. Bishop <amb>
* web/translations/translation.ru.txt: Add updated Russian
translations submitted via http://www.routino.org/translations/
around 2014-05-20.
2014-05-20 [r1573] Andrew M. Bishop <amb>
* src/visualiser.c: When visualising segments include all of the
ones that overlap the selected region (not missing a few that
cross the edges).
2014-05-19 [r1572] Andrew M. Bishop <amb>
* web/translations/translation.de.txt,
web/translations/translation.fr.txt,
web/translations/translation.nl.txt,
web/translations/translation.ru.txt,
web/translations/translations-body.xml,
xml/routino-translations.xml: Remove un-needed whitespace in
translations files.
2014-05-17 Andrew M. Bishop <amb>
Version 2.7.1 released.
2014-05-17 [r1570] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update
documentation for version 2.7.1.
2014-05-17 [r1569] Andrew M. Bishop <amb>
* web/Makefile: Re-create the xml/routino-translations.xml file if
the translations are updated or the file is deleted.
2014-05-17 [r1568] Andrew M. Bishop <amb>
* xml/routino-translations.xml: Add updated German translations
submitted via http://www.routino.org/translations/ around
2014-04-11 and 2014-05-02.
2014-05-12 [r1567] Andrew M. Bishop <amb>
* src/prunex.c: When pruning short segments take the highway types
into account when sharing the pruned segment length between the
two neighbouring segments.
2014-05-10 [r1565-1566] Andrew M. Bishop <amb>
* src/test, src/test/a-b-c-d.sh (added),
src/test/coincident-waypoint.osm (added),
src/test/coincident-waypoint.sh (added),
src/test/expected/coincident-waypoint-WP01.txt (added),
src/test/expected/coincident-waypoint-WP02.txt (added),
src/test/expected/coincident-waypoint-WP03.txt (added),
src/test/expected/coincident-waypoint-WP04.txt (added): Add test
cases for routes with contain two consecutive coincident
waypoints.
* src/fakes.c, src/fakes.h, src/output.c, src/router.c: Don't crash
if the specified route contains two consecutive coincident
waypoints (route instructions at those points may not be
perfect).
2014-05-09 [r1564] Andrew M. Bishop <amb>
* src/output.c, src/test/expected/loops-WP01.txt,
src/test/expected/loops-WP02.txt,
src/test/expected/loops-WP06.txt,
src/test/expected/loops-WP07.txt: Fix bug with results output
that would miss a segment and get the distance/time wrong if a
waypoint node was passed again on the way to the next waypoint.
2014-05-05 [r1563] Andrew M. Bishop <amb>
* src/optimiser.c: Remove some left-over debugging print
statements.
2014-05-03 [r1562] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translations submitted via http://www.routino.org/translations/
around 2014-05-02. (Some of the changes from the 2014-04-11
submission were not merged last time, they have been included
this time).
2014-05-02 [r1561] Andrew M. Bishop <amb>
* web/translations/translation.de.txt: Add updated German
translations submitted via http://www.routino.org/translations/
around 2014-04-11.
2014-04-30 [r1560] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html, src/filedumper.c,
src/osmparser.c, src/visualiser.c, src/visualiser.h,
web/translations/translation.en.txt,
web/translations/visualiser.html, web/www/routino/visualiser.cgi,
web/www/routino/visualiser.leaflet.js,
web/www/routino/visualiser.openlayers.js: Update the visualiser
web page to allow displaying the "cyclebothways" highway type and
the "roundabout" highway type. Also "cyclebothways" is no longer
a property so removed from that part of the visualiser.
2014-04-29 [r1559] Andrew M. Bishop <amb>
* src/filedumper.c, src/optimiser.c, src/osmparser.c, src/output.c,
src/segments.c, src/types.c, src/types.h,
xml/routino-profiles.xml: Remove the "cyclebothways" property and
replace it with a "cyclebothways" highway type. This means that
it is no longer possible to choose a preference for this type of
highway when calculating a route. There was never really any
reason for allowing users to do this since they can't specify a
preference for oneway streets. It does however mean that the
broken Javascript in the router web page (no entry field for this
property) is fixed. Unfortunately this means that a database
created by previous versions are not compatible with this one.
2014-04-28 [r1558] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Add some missing items
into the documentation related to cycling both ways.
2014-04-28 [r1557] Andrew M. Bishop <amb>
* web/Makefile: Fix bug with updating XML files in web/data
directory (Makefile error).
2014-04-28 [r1556] Andrew M. Bishop <amb>
* src/test, src/test/cycle-both-ways.osm (added),
src/test/cycle-both-ways.sh (added), src/test/cycle-drive.sh
(added), src/test/expected/cycle-both-ways-WP01.txt (added),
src/test/expected/cycle-both-ways-WP02.txt (added): Add a test
case for the ability to cycle both ways on highways that allow
it. Tests the roundabout exit naming as well as shortest route.
2014-04-28 [r1555] Andrew M. Bishop <amb>
* src/test/fake-node-with-loop.osm, src/test/prune-straight.osm,
src/test/roundabout-waypoints.osm: Remove unneeded tag from <osm>
XML element.
2014-04-27 [r1553-1554] Andrew M. Bishop <amb>
* src/test, src/test/expected/fake-node-with-loop-WP01.txt (added),
src/test/expected/fake-node-with-loop-WP02.txt (added),
src/test/fake-node-with-loop.osm (added),
src/test/fake-node-with-loop.sh (added): Add test case for the
bug with particular arrangement of a fake node (waypoint in
middle of segment) and a roundabout.
* src/optimiser.c, src/segments.h: Fix bug with particular
arrangement of a fake node (waypoint in middle of segment) and a
roundabout. The FindFinishRoutes() function was invalidly
allowing a U-turn which the later parts of the route calculation
didn't and therefore failed to find a route.
2014-04-26 [r1552] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html,
web/www/routino/search.cgi, web/www/routino/search.pl: Correct
the list of Perl modules required to be installed to use the
search function.
2014-04-24 [r1551] Andrew M. Bishop <amb>
* xml/scripts/drive.pl, xml/scripts/walk.pl: Omit some more
properties from the special case tagging rules.
2014-04-14 [r1550] Andrew M. Bishop <amb>
* src/optimiser.c: Revert r1462 which makes no noticeable
difference to the speed in normal operation but makes a lot of
difference for databases created with the special "drive" tagging
rules.
2014-04-14 [r1549] Andrew M. Bishop <amb>
* src/router.c: Check the number of waypoints after considering the
--help and --help-profile options.
2014-04-12 [r1548] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Disable the route
calculation buttons if fewer than two waypoints are active (more
cases).
2014-04-12 [r1545-1547] Andrew M. Bishop <amb>
* web/Makefile: Automatically update the translated files if the
translation files or HTML templates change.
* web/translations/router.html, web/www/routino/router.css,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Disable the route
calculation buttons if fewer than two waypoints are active.
* src/router.c: Refuse to calculate a route if fewer than two
waypoints are specified.
2014-04-08 [r1544] Andrew M. Bishop <amb>
* web/translations/translate.pl: Make script work with older
versions of Perl.
2014-04-06 [r1543] Andrew M. Bishop <amb>
* src/output.c: Change routing instructions if on a bicycle and
cyclebothways is enabled on the highways at the junctions (e.g.
different count of roundabout exits).
2014-04-05 [r1540-1542] Andrew M. Bishop <amb>
* src/test, src/test/expected/roundabout-waypoints-WP01.txt
(added), src/test/expected/roundabout-waypoints-WP02.txt (added),
src/test/expected/roundabout-waypoints-WP03.txt (added),
src/test/expected/roundabout-waypoints-WP04.txt (added),
src/test/expected/roundabout-waypoints-WP05.txt (added),
src/test/expected/roundabout-waypoints-WP06.txt (added),
src/test/expected/roundabout-waypoints-WP07.txt (added),
src/test/roundabout-waypoints.osm (added),
src/test/roundabout-waypoints.sh (added): Add test case for
router error when waypoint is on a roundabout. [Test case also
unintentionally detected the super-segment merging bug.]
* src/test/Makefile: Compile programs before running tests (fix
Makefile bug).
* src/superx.c: Fix bug with merging super-segments and segments -
an improvement on fix that was applied in version 2.7.
2014-04-04 [r1539] Andrew M. Bishop <amb>
* src/output.c: Fix router error when waypoint is on a roundabout
(stops crash).
2014-04-02 [r1537-1538] Andrew M. Bishop <amb>
* web/translations/translate.pl: Don't use HTML character entity
encoding for UTF-8 characters in the HTML.
* web/translations/translation.de.txt,
web/translations/translation.fr.txt,
web/translations/translation.nl.txt,
web/translations/translation.ru.txt: Trivial changes to the
translation files to put them all into the same order.
2014-04-01 [r1536] Andrew M. Bishop <amb>
* web/translations/router.html, web/translations/translate.pl,
web/translations/translation.ru.txt,
web/translations/translations-body.xml,
web/translations/visualiser.html: Use '~~' delimiters in the
templates for the special-case replacement strings (like the
language name).
2014-03-31 [r1535] Andrew M. Bishop <amb>
* web/translations/router.html, web/translations/translate.pl,
web/translations/visualiser.html: Use '$$' delimiters in the
templates for the multi-line replacement strings (to match the
files of translation phrases).
2014-03-25 [r1534] Andrew M. Bishop <amb>
* web/translations/translation.ru.txt, web/www/routino,
xml/routino-translations.xml: Add Russian translations submitted
via http://www.routino.org/translations/ around 2014-03-23.
2014-03-24 [r1533] Andrew M. Bishop <amb>
* web/translations/translate.pl,
web/translations/translation.de.txt,
web/translations/translation.en.txt,
web/translations/translation.fr.txt,
web/translations/translation.nl.txt,
web/translations/translation.ru.txt (added),
web/translations/translations-body.xml (added),
web/translations/translations-head.xml (added),
web/translations/translations-tail.xml (added): Create the
routino-translations.xml file from the translated language files
in the same way as the HTML. Reverse engineer the existing XML
file into the translation files for the languages.
2014-03-23 [r1532] Andrew M. Bishop <amb>
* doc/README.txt, doc/html/readme.html: Fixed typo in subversion
command line example.
2014-03-22 Andrew M. Bishop <amb>
Version 2.7 released.
2014-03-22 [r1529-1530] Andrew M. Bishop <amb>
* FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html:
Updated for new release.
* doc/INSTALL.txt: Fix missing text when translated from HTML to
plain text.
2014-03-22 [r1528] Andrew M. Bishop <amb>
* doc/Makefile, extras/find-fixme/Makefile,
extras/tagmodifier/Makefile, src/Makefile, src/test/Makefile,
src/xml/Makefile, web/Makefile, xml/Makefile: Another iteration
through the Makefiles with some small changes.
2014-03-18 [r1527] Andrew M. Bishop <amb>
* src/profiles.c, web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Run jshint again and fix
some recently added changes.
2014-03-17 [r1525-1526] Andrew M. Bishop <amb>
* src/osmo5mparse.c, src/osmparser.h, src/osmpbfparse.c: Make two
global functions local to the files that contain them.
* src/errorlog.h, src/tagging.c: Fix some invalid function
comments.
2014-03-15 [r1524] Andrew M. Bishop <amb>
* web/translations/translate.pl,
web/translations/translation.de.txt: Store the translations as
UTF-8 in the text files and convert to HTML character entities
when writing the HTML.
2014-03-11 [r1523] Andrew M. Bishop <amb>
* Makefile, Makefile.conf, doc/Makefile,
extras/find-fixme/Makefile, extras/tagmodifier/Makefile,
src/Makefile, web/Makefile (added), xml/Makefile: Update the
Makefiles by creating one in the web directory and moving parts
from the src, doc and xml Makefiles into it.
2014-03-11 [r1522] Andrew M. Bishop <amb>
* web/www/routino: Ignore the translated HTML files.
2014-03-08 [r1521] Andrew M. Bishop <amb>
* web/translations (added), web/translations/router.html (added),
web/translations/translate.pl (added),
web/translations/translation.de.txt (added),
web/translations/translation.en.txt (added),
web/translations/translation.fr.txt (added),
web/translations/translation.nl.txt (added),
web/translations/visualiser.html (added),
web/www/routino/router.html.de (removed),
web/www/routino/router.html.en (removed),
web/www/routino/router.html.fr (removed),
web/www/routino/router.html.nl (removed),
web/www/routino/visualiser.html.en (removed): Create the router
and visualiser HTML files from templates and lists of translated
phrases.
2014-03-08 [r1520] Andrew M. Bishop <amb>
* extras/errorlog/summarise-log.pl,
extras/find-fixme/web/www/fixme.cgi,
extras/plot-time/plot-planetsplitter-time.pl,
src/test/waypoints.pl, 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, xml/scripts/drive.pl,
xml/scripts/ride.pl, xml/scripts/walk.pl: Update all Perl scripts
to "use strict".
2014-03-08 [r1518-1519] Andrew M. Bishop <amb>
* src/xmlparse.h: Print the XML line number using the correct
formatting for a uint64_t type.
* src/files.c: Don't ignore the return value of the write()
function call.
2014-03-01 [r1516] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html,
extras/find-fixme/web/www/fixme.openlayers.js,
web/www/openlayers/install.sh,
web/www/routino/router.openlayers.js,
web/www/routino/visualiser.openlayers.js: Updated to version
2.13.1 of OpenLayers (also 2.12 still supported).
2014-02-23 [r1515] Andrew M. Bishop <amb>
* web/www/routino/icons/waypoint-left.png (added),
web/www/routino/icons/waypoint-right.png (added),
web/www/routino/router.html.de, web/www/routino/router.html.en,
web/www/routino/router.html.fr, web/www/routino/router.html.nl,
web/www/routino/router.leaflet.js,
web/www/routino/router.openlayers.js: Add buttons to allow
increasing/decreasing the transport properties and preferences
(to help on tablet devices where typing a number in a box is
hard).
2014-02-22 [r1514] Andrew M. Bishop <amb>
* extras/tagmodifier/README.txt, extras/tagmodifier/tagmodifier.c,
src/uncompress.h, doc/html/installation.html,
doc/html/usage.html, Makefile.conf, src/planetsplitter.c,
src/uncompress.c, doc/USAGE.txt, extras/find-fixme/README.txt,
doc/INSTALL.txt, extras/find-fixme/fixme-finder.c: Add the option
for automatic uncompression of .xz compressed files (not enabled
by default in Makefile.conf).
2014-02-22 [r1513] Andrew M. Bishop <amb>
* web/data/create.sh: Downloads from GeoFabrik only and URLs
changed.
2014-02-22 [r1512] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html: Clarify that gzip
support is required for some PBF files. Clarify that
multi-threading, gzip and bzip2 are enabled by default at
compilation time.
2014-02-02 [r1511] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some synonyms for
"cycleway=opposite_lane".
2014-02-02 [r1510] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Handle "access=bus" like "access=psv".
2014-02-01 [r1509] Andrew M. Bishop <amb>
* web/www/routino/maploader.js: Ensure that all Javascript files
are loaded before calling the callbacks (better implementation).
2014-02-01 [r1508] Andrew M. Bishop <amb>
* web/www/routino/maploader.js: Ensure that all Javascript files
are loaded before calling the callbacks.
2014-02-01 [r1507] Andrew M. Bishop <amb>
* web/www/routino/router.openlayers.js,
web/www/routino/router.leaflet.js: Allow mouse clicks in the
router result description to popup the details and not just
mouseovers. Hopefully this should work better for touch devices.
2014-01-31 [r1506] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js: Handle the new
format XML (using ''' instead of ''').
2014-01-31 [r1505] Andrew M. Bishop <amb>
* src/xmlparse.c, src/output.c: Output HTML4 strict DTD compliant
HTML (fix bug with using ''' instead of ''').
2014-01-30 [r1504] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/USAGE.txt, src/router.c: Add an option
to calculate a circular route.
2014-01-30 [r1503] Andrew M. Bishop <amb>
* doc/USAGE.txt, src/router.c, doc/html/usage.html: Add an option
to calculate a route in the reverse order.
2014-01-30 [r1502] Andrew M. Bishop <amb>
* src/types.h: Make the type conversion inline functions static so
that compiling with -O0 still works.
2014-01-29 [r1501] Andrew M. Bishop <amb>
* src/results.h, src/types.h, src/output.c, src/router.c,
src/results.c: Refactor the code so that the Results data type
has the start and finish waypoints defined within it and the
array passed to the PrintRoute() function doesn't have holes in
it.
2014-01-28 [r1500] Andrew M. Bishop <amb>
* src/router.c: Remove ancient option that allowed latitude and
longitude to be specified on the command line without the
--lat<n> or --lon<n> options.
2014-01-28 [r1499] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
extras/find-fixme/web/www/fixme.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/visualiser.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
web/www/routino/visualiser.openlayers.js: Add close buttons to
the popup boxes.
2014-01-27 [r1498] Andrew M. Bishop <amb>
* web/www/routino/visualiser.html.en, src/profiles.c: Allow
displaying the cyclebothways property in the visualiser.
2014-01-27 [r1497] Andrew M. Bishop <amb>
* doc/html/tagging.html, src/types.c, xml/routino-tagging.xml,
src/segments.c, xml/routino-profiles.xml, src/types.h,
doc/TAGGING.txt, src/optimiser.c, src/osmparser.c: Detect the
"cycleway=opposite_lane" tag and allow bicycles to travel in both
directions along those highways. Based on parts of
https://github.com/cgravier/routino-2.6-bikeopposite-elevation/commit/47d68b37f1ea0d2f967ea6aa1555991747491200
https://github.com/cgravier/routino-2.6-bikeopposite-elevation/commit/764832f2671e6f6d8176be65cea3992bd1a488d3
https://github.com/cgravier/routino-2.6-bikeopposite-elevation/commit/37af908880c045309fba1125c4d683f6925f7d25
by Christophe Collard.
2014-01-26 [r1496] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.leaflet.js,
web/www/routino/router.openlayers.js,
web/www/routino/visualiser.leaflet.js,
extras/find-fixme/web/www/fixme.openlayers.js,
web/www/routino/visualiser.openlayers.js,
web/www/routino/router.leaflet.js: Fix bugs in displayStatus()
function after jshint tidy-up.
2014-01-26 [r1495] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
extras/find-fixme/web/www/fixme.leaflet.js,
web/www/routino/visualiser.leaflet.js: Fix bug with Leaflet map
startup.
2014-01-26 [r1494] Andrew M. Bishop <amb>
* web/www/routino/mapprops.js: Reformat the whitespace.
2014-01-26 [r1493] Andrew M. Bishop <amb>
* web/www/routino/router.leaflet.js,
extras/find-fixme/web/www/fixme.leaflet.js, src/profiles.c,
web/www/routino/router.openlayers.js,
web/www/routino/visualiser.leaflet.js,
web/www/routino/maploader.js,
extras/find-fixme/web/www/fixme.openlayers.js,
web/www/routino/page-elements.js,
web/www/routino/visualiser.openlayers.js: Run jshint again and
update some more in the JavaScript.
2014-01-25 [r1492] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/readme.html, web/www/leaflet/install.sh
(added), doc/html/installation.html, web/www/leaflet (added),
doc/README.txt: Add a script to download Leaflet Javascript and
update documentation to match.
2014-01-25 [r1491] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.html, extras/find-fixme/Makefile,
web/www/routino/router.html.de,
web/www/routino/router.openlayers.js (added),
web/www/routino/mapprops.js,
web/www/routino/visualiser.leaflet.js (added),
web/www/routino/maploader.js (added),
extras/find-fixme/web/www/fixme.js (removed),
web/www/routino/visualiser.openlayers.js (added),
web/www/routino/router.html.en, web/www/routino/router.html.fr,
web/www/routino/visualiser.html.en,
extras/find-fixme/web/www/fixme.leaflet.js (added),
web/www/routino/router.html.nl, web/www/routino/router.js
(removed), extras/find-fixme/web/www,
extras/find-fixme/web/www/fixme.openlayers.js (added),
web/www/routino/visualiser.js (removed),
web/www/routino/maplayout.css, web/www/routino/router.leaflet.js
(added): Add the option to use Leaflet Javascript library instead
of OpenLayers. Dynamically load the appropriate Javascript
library based on mapprops.js.
2014-01-16 [r1489-1490] Andrew M. Bishop <amb>
* src/superx.c: When merging segments and super-segments ensure
that all super-segments are added to the merged list.
* src/visualiser.c: When searching for nodes for the visualiser
don't exceed the database lat/long limits.
2014-01-13 [r1488] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.fr
(added), web/www/routino/router.html.de,
web/www/routino/router.html.nl, xml/routino-translations.xml:
French language web page and routing translations based on
https://github.com/ocivelo/routino-2.6-bikeopposite-elevation/commit/d426c7ff42e217ca5ace1244afc085c1433843c8
by Christophe Collard.
2014-01-11 [r1487] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/search.pl,
extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js, web/www/routino/search.cgi: Change
the search CGI to use latmin/max and lonmin/max instead of left,
right, top, bottom. Change the Javascript to send the parameters
to 5 decimal places only.
2014-01-11 [r1486] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js, web/www/routino/router.html.en,
extras/find-fixme/web/www/fixme.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js: Update
the web page URLs as things change rather than using
on(focus|click) action handlers in the HTML that don't work very
well.
2014-01-05 [r1485] Andrew M. Bishop <amb>
* web/www/routino/maplayout-ie6-bugfixes.css (removed),
web/www/routino/maplayout-ie7-bugfixes.css (removed),
web/www/routino/router.html.en,
extras/find-fixme/web/www/fixme.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl: Remove special support for IE6
and IE7 browsers.
2014-01-05 [r1484] Andrew M. Bishop <amb>
* web/www/routino/router.js, extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js: Replace the unescape() function
with standard decodeURIComponent() function.
2014-01-03 [r1483] Andrew M. Bishop <amb>
* web/www/routino/router.js, extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js: Run 'jshint' to check for
Javascript errors (fix the important ones).
2014-01-03 [r1480-1482] Andrew M. Bishop <amb>
* web/www/routino/page-elements.js: Add a new function to hide and
show sections (not currently used).
* web/www/routino/page-elements.css: Make the tabs and hide/show
targets a few pixels wider to make them easier to select.
* web/www/routino/router.html.en, web/www/routino/router.html.de,
web/www/routino/router.html.nl: Squeeze out a bit more space for
the waypoint coords/name.
2014-01-02 [r1479] Andrew M. Bishop <amb>
* src/relationsx.h: Fix error in function prototype (argument names
switched).
2013-12-31 [r1477-1478] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js, web/www/routino/router.js: Update
Javascript to make map tile function more self-contained.
* extras/find-fixme/web/www/fixme.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/openlayers/routino.cfg,
web/www/routino/router.html.en: Update HTML to make it work
better on mobile devices (no zooming allowed).
2013-12-31 [r1476] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl: Update HTML ready for HTML5 but
keeping HTML4.01 loose DTD (form action attribute must not be
empty).
2013-12-31 [r1475] Andrew M. Bishop <amb>
* web/www/routino/router.css, extras/find-fixme/web/www/fixme.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
extras/find-fixme/web/www/fixme.css,
web/www/routino/visualiser.css, web/www/routino/router.html.en:
Update HTML ready for HTML5 but keeping HTML4.01 loose DTD (align
attribute and image tags with names are deprecated).
2013-12-31 [r1474] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/html/output.html,
doc/html/tagging.html, doc/html/installation.html,
doc/html/limits.html, doc/html/usage.html,
doc/html/algorithm.html, doc/html/configuration.html,
doc/html/index.html, doc/html/data.html: Update HTML ready for
HTML5 but keeping HTML4.01 strict DTD (anchors with names are
deprecated).
2013-12-30 [r1473] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/html/data.html: Update some URLs.
2013-12-30 [r1472] Andrew M. Bishop <amb>
* web/www/routino/router.html.en,
extras/find-fixme/web/www/fixme.html, web/www/routino/index.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl: Fix some changes that were missed
from the last set of HTML updates.
2013-12-30 [r1471] Andrew M. Bishop <amb>
* doc/html/installation.html: Fix links within the page.
2013-12-30 [r1469-1470] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.html, web/www/routino/index.html,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.html.en:
Convert map pages to use lower case HTML tags and fix some HTML
4.01 strict DTD errors (but not converted to strict DTD due to
use of target attribute on <a> tags).
* doc/html/style.css, doc/html/usage.html, doc/html/algorithm.html,
doc/html/configuration.html, doc/html/index.html,
doc/html/data.html, extras/find-fixme/web/www/index.html,
doc/html/readme.html, doc/html/output.html,
doc/html/tagging.html, doc/html/installation.html,
doc/html/limits.html: Convert documentation to HTML 4.01 strict
DTD (from loose DTD).
2013-11-17 [r1468] Andrew M. Bishop <amb>
* web/www/routino/router.cgi: Fix bug that did not allow more than
9 waypoints to be routed.
2013-11-13 [r1467] Andrew M. Bishop <amb>
* src/osmparser.c: Refactor the length, weight and speed parsing
functions a little bit and add some new formats.
2013-09-07 [r1466] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add the same "access=foot" aliasing to
nodes as previously existed for ways.
2013-08-02 [r1465] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/USAGE.txt, src/output.c, src/router.c:
Add a '--output-stdout' option.
2013-07-31 [r1464] Andrew M. Bishop <amb>
* xml/routino-translations.xml: Updated Dutch translations.
2013-07-18 [r1463] Andrew M. Bishop <amb>
* src/types.h: Replace the macros for type conversion with inline
functions where there is a risk of overflow for normal data.
2013-07-14 [r1462] Andrew M. Bishop <amb>
* src/optimiser.c: Removal of some code intended to speed things up
but that actually slows things down.
2013-07-12 [r1461] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/ALGORITHM.txt: Update the algorithm
documentation with a description of the algorithm used for
finding the shortest path.
2013-07-10 [r1460] Andrew M. Bishop <amb>
* Makefile.conf: Add an option to enable debugging symbols.
2013-07-08 [r1459] Andrew M. Bishop <amb>
* doc/USAGE.txt: Fix typo in documentation string.
2013-07-08 [r1458] Andrew M. Bishop <amb>
* doc/html/usage.html, src/filedumper.c: Fix typo in documentation
string.
2013-07-06 Andrew M. Bishop <amb>
Version 2.6 released.
2013-07-06 [r1455-1456] Andrew M. Bishop <amb>
* FILES: Add some new files for version 2.6.
* doc/Makefile, extras/Makefile, src/test/Makefile, src/Makefile,
extras/find-fixme/Makefile, Makefile,
extras/tagmodifier/Makefile, xml/Makefile: Update some Makefiles
for running 'make test' from a clean set of source code.
2013-07-06 [r1454] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html: Update
for version 2.6 release.
2013-07-04 [r1453] Andrew M. Bishop <amb>
* doc/html/installation.html, doc/INSTALL.txt: Added a 'quick
start' set of installation instructions.
2013-07-04 [r1452] Andrew M. Bishop <amb>
* web/data/create.sh: Fix error with URL.
2013-07-03 [r1451] Andrew M. Bishop <amb>
* src/planetsplitter.c: Revert r1268 which was applied between v2.5
and v2.5.1 and could be the cause of the slight slowdown in
version 2.5.1.
2013-07-02 [r1450] Andrew M. Bishop <amb>
* src/relationsx.c, src/errorlog.c, src/logerror.c,
src/optimiser.c, src/waysx.c, src/xmlparse.c: Fix some comments.
2013-07-02 [r1449] Andrew M. Bishop <amb>
* src/logging.c: Fix bug in time printed by --logtime option.
2013-07-02 [r1448] Andrew M. Bishop <amb>
* src/segmentsx.c, src/prunex.c, src/segmentsx.h: Revert r1432
because even though it seemed like it should have been faster in
slim mode it was actually much slower on the routino.org virtual
server.
2013-07-01 [r1447] Andrew M. Bishop <amb>
* src/output.c: Small optimisation for calling GetLatLong().
2013-07-01 [r1446] Andrew M. Bishop <amb>
* web/data/create.sh: Fix the URLs in the example download script.
2013-07-01 [r1445] Andrew M. Bishop <amb>
* src/xmlparse.c, src/xmlparse.h: Forcing the xmlparse tags to be
lower case adds a further speed-up (and was implicitly assumed
already in other code).
2013-07-01 [r1444] Andrew M. Bishop <amb>
* src/results.h, src/superx.c, src/results.c, src/queue.c: Re-use
the Queue and Results data structure for all routes - saves a
huge number of malloc/free calls (found by valgrind/callgrind).
2013-06-29 [r1443] Andrew M. Bishop <amb>
* src/xmlparse.c: Optimise out most calls to strcasecmp the
most-called C library functions (found by valgrind/callgrind).
2013-06-29 [r1442] Andrew M. Bishop <amb>
* src/prunex.c: Close file and free memory (found by valgrind).
2013-06-29 [r1441] Andrew M. Bishop <amb>
* src/sorting.c: Free allocated memory (found by valgrind).
2013-06-29 [r1440] Andrew M. Bishop <amb>
* src/logerror.c: Avoid writing uninitialised to disk (found by
valgrind).
2013-06-29 [r1439] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.js,
extras/find-fixme/web/www/fixme.html: Update highlight size and
help text as was done with visualiser.
2013-06-29 [r1438] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl: Add some help to the visualiser
web page and slightly reformatted the help on the router web
pages.
2013-06-29 [r1435-1437] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js: Increase the size of the nodes in
the super-nodes/segments display to make them clickable.
* web/www/routino/visualiser.cgi: Increase the maximum size that
will be returned by CGI.
* web/www/routino/visualiser.js: Fix bug with visualiser failing to
run failure callback in case of CGI error.
2013-06-29 [r1433-1434] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js: Make the node highlights smaller
(to match the segment highlight width).
* src/filedumper.c: Print the fake XML for the visualiser with
special routino:* top-level tag names.
2013-06-28 [r1431-1432] Andrew M. Bishop <amb>
* src/segmentsx.c, src/prunex.c, src/segmentsx.h: Keep the next2
pointer in memory while pruning rather than in the segmentx
object.
* src/prunex.h, src/planetsplitter.c, src/segmentsx.c,
src/prunex.c, src/segmentsx.h, doc/DATALIFE.txt: Revert the last
three changes because r1430 didn't work and r1428+r1429 didn't
give any speed advantage and was possibly marginally slower.
2013-06-28 [r1430] Andrew M. Bishop <amb>
* src/segmentsx.c: The IndexSegments() function can now process the
file in forward order rather than reverse.
2013-06-27 [r1429] Andrew M. Bishop <amb>
* src/segmentsx.c: Fixed error with last checkin.
2013-06-27 [r1428] Andrew M. Bishop <amb>
* src/segmentsx.c, src/prunex.c, src/segmentsx.h, doc/DATALIFE.txt,
src/prunex.h, src/planetsplitter.c: Put the next1 pointer in the
segmentx object rather than in-memory.
2013-06-27 [r1427] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c, src/nodesx.c,
src/segmentsx.h: Revert the last change because, paradoxically,
it was faster to create the database (as expected) but slower to
route.
2013-06-26 [r1426] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c, src/nodesx.c,
src/segmentsx.h: Sort the nodes geographically at the beginning
rather than at the end.
2013-06-26 [r1425] Andrew M. Bishop <amb>
* doc/html/installation.html, doc/INSTALL.txt: Add some more
details about configuring Apache.
2013-06-25 [r1424] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/nodesx.c,
doc/DATALIFE.txt: Remove one usage of the nodesx->gdata array.
Remove one call of the IndexSegments() function. Update the
DATALIFE.txt file with both and the previous changes to mapped
files and add a new column for segmentx->next2.
2013-06-25 [r1423] Andrew M. Bishop <amb>
* src/superx.c: Change the ChooseSuperNodes() and
MergeSuperSegments() functions to read through the file instead
of mapping the data to help slim mode (since the nodes in the
first case and segments in the second case are read
sequentially).
2013-06-24 [r1422] Andrew M. Bishop <amb>
* src/segmentsx.c: Change the IndexSegments() function so that in
slim mode larger chunks are read from the file (since it reads
sequentially but in reverse through the file).
2013-06-24 [r1420-1421] Andrew M. Bishop <amb>
* src/files.c: Increase the buffer to 4kB from 1kB.
* src/osmo5mparse.c, src/waysx.c, src/nodesx.c, src/osmpbfparse.c,
src/prunex.c, src/superx.c, src/relationsx.c: Move some
printf_first() messages to the front of the function and
printf_last() function to the end of the function.
2013-06-23 [r1419] Andrew M. Bishop <amb>
* src/ways.h: Fix error in slim mode WayName() function.
2013-06-22 [r1412-1418] Andrew M. Bishop <amb>
* src/files.c, src/files.h: Make the changes required to handle the
new function names from the last few checkins.
* src/prunex.c: Use SlimMapFile(), SlimUnmapFile(), SlimFetch() and
SlimReplace() [see earlier log message] and also refactor the
code so that the additional ways are placed in a separate file
using the Slim*() functions rather than being appended to the
open (or mapped) way file.
* src/ways.h: Use SlimFetch() instead of SeekReadFileUnbuffered()
[see previous log message] and also refactor the code for reading
the way name from file.
* src/errorlog.h, src/relations.c, src/ways.c, src/segments.c,
src/cache.h, src/nodes.c, src/errorlog.c: Use SlimMapFile() and
SlimUnmapFile() [see previous log message] and also use
SlimFetch() instead of SeekReadFileUnbuffered() and SlimReplace()
instead of SeekWriteFileUnbuffered() to hide the internals of the
slim mode.
* src/superx.c, src/relationsx.c, src/waysx.c, src/segmentsx.c,
src/errorlogx.c: Use SlimMapFile() and SlimUnmapFile() as the
function names for the slim mode of operation to open and close
the files (to hide the fact that they are files being opened for
reading or writing unbuffered).
* src/errorlogx.c: Use buffered file accesses for appending the
error strings to the binary file.
* src/planetsplitter.c, src/tagging.c, src/translations.c,
extras/find-fixme/fixme-finder.c,
extras/tagmodifier/tagmodifier.c, src/profiles.c: Create simple
OpenFile() and CloseFile() functions for those files which are
used by the parsers (they just call open() and close()
internally).
2013-06-22 [r1411] Andrew M. Bishop <amb>
* src/logerror.c: Fix for closing binary error file that only shows
up after the recent file function changes.
2013-06-21 [r1410] Andrew M. Bishop <amb>
* src/files.c, extras/tagmodifier/tagmodifier.c, src/files.h,
src/cache.h, src/nodes.c, src/planetsplitter.c, src/waysx.c,
src/segmentsx.c, src/tagging.c, src/prunex.c, src/translations.c,
extras/find-fixme/fixme-finder.c, src/errorlogx.c,
src/profiles.c, src/ways.c, src/filedumperx.c, src/segments.c,
src/superx.c, src/ways.h, src/relationsx.c, src/errorlog.c,
src/errorlog.h, src/relations.c: Rename the functions for
unbuffered file access to make this clear.
2013-06-21 [r1409] Andrew M. Bishop <amb>
* src/waysx.c, src/segmentsx.c, src/nodesx.c, src/errorlogx.c,
src/sorting.c, src/relationsx.c: Use the new buffered functions
in the filesort functions.
2013-06-21 [r1407-1408] Andrew M. Bishop <amb>
* src/segmentsx.c, src/nodesx.c, src/prunex.c, src/errorlogx.c,
src/filedumperx.c, src/relationsx.c, src/logerror.c, src/waysx.c:
Use the new functions for buffering while reading when looping
through files other than the ones already done that use the
FILESORT_VARINT method of storing data.
* src/files.c, src/files.h: Add a new function for seeking in one
of the buffered files.
2013-06-20 [r1406] Andrew M. Bishop <amb>
* src/errorlogx.c, src/files.h, src/relationsx.c, src/waysx.c,
src/nodesx.c, src/files.c: Rename the function that skips forward
in a buffered file to avoid confusion.
2013-06-20 [r1404-1405] Andrew M. Bishop <amb>
* src/relationsx.c, src/waysx.c, src/nodesx.c, src/errorlogx.c,
src/filedumperx.c: Use the new functions for buffering while
reading when looping through files that use the FILESORT_VARINT
method of storing data.
* src/files.c, src/files.h: Add new functions for buffering when
reading and also allow seeking in one of these buffered files.
2013-06-20 [r1403] Andrew M. Bishop <amb>
* src/files.c: Fix the non-buffered close function assertion and
re-factor the code for buffered reading (although not used yet).
2013-06-19 [r1401-1402] Andrew M. Bishop <amb>
* src/nodesx.c, src/relationsx.c, src/waysx.c, src/segmentsx.c: Use
the buffered write functions when creating the nodes, segments,
ways and relation raw files.
* src/files.c, src/files.h: Add functions to read and write file
descriptors with buffering.
2013-06-19 [r1400] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-finder.c, src/logging.c,
src/planetsplitter.c: Bug fix for the change to the --logtime
option functions.
2013-06-19 [r1399] Andrew M. Bishop <amb>
* src/files.h: Split the function prototypes into two groups for
the ones in files.c and the inline ones in files.h.
2013-06-17 [r1398] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-finder.c, src/logging.c,
src/planetsplitter.c, src/logging.h: Change the --logtime
internals so that programs don't need to store their start time
themselves.
2013-06-15 [r1397] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some more barriers which are too
generic to warn about and fix spelling of motorcycle_barrier.
2013-06-13 [r1396] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/USAGE.txt: Document that --errorlog and
--keep together will create the binary database of errors.
2013-06-13 [r1395] Andrew M. Bishop <amb>
* src/errorlogx.c, src/logerror.c, src/logging.h: Separate out the
type and id parts of the errorlogobject.
2013-06-12 [r1394] Andrew M. Bishop <amb>
* web/www/routino/mapprops.js, doc/html/installation.html,
extras/find-fixme/web/www/fixme.js,
web/www/routino/visualiser.js, doc/INSTALL.txt: Add links to the
OpenStreetMap browse URLs from the error logs.
2013-06-11 [r1393] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.js,
extras/find-fixme/web/www/fixme.cgi,
extras/find-fixme/web/www/fixme.html: Put the data tab back and
display the statistics in it.
2013-06-10 [r1391-1392] Andrew M. Bishop <amb>
* src/errorlogx.c: Fix typo in program logging.
* doc/html/usage.html, doc/USAGE.txt: Fix typo in documentation.
2013-06-06 [r1387-1390] Andrew M. Bishop <amb>
* src/Makefile: Tidy up the compilation and linking flags again.
* Makefile.conf: Tidy up the compilation and linking flags again.
* src/test/Makefile, src/test/is-fast-math.c (added), src/test,
src/test/start-1-finish.sh, src/test/a-b-c.sh, src/test/a-b.sh:
When compiled with -ffast-math don't expect the results to match
exactly, display the differences.
* src/test/only-split.sh: Remove a debugging message.
2013-06-06 [r1386] Andrew M. Bishop <amb>
* src/test/expected/dead-ends-WP08.txt,
src/test/expected/dead-ends-WP09.txt, src/test/dead-ends.osm,
src/test/expected/node-restrictions-WP08.txt,
src/test/expected/dead-ends-WP01.txt,
src/test/expected/dead-ends-WP10.txt,
src/test/expected/dead-ends-WP02.txt,
src/test/expected/dead-ends-WP11.txt,
src/test/expected/dead-ends-WP03.txt,
src/test/expected/dead-ends-WP04.txt,
src/test/expected/dead-ends-WP05.txt,
src/test/expected/dead-ends-WP06.txt,
src/test/expected/dead-ends-WP07.txt: Change test cases so that
they don't show differences due to pruning or the last checkin
for divide by zero which changed behaviour in trivial case.
2013-06-06 [r1385] Andrew M. Bishop <amb>
* src/prunex.c, src/nodes.c, src/fakes.c: Fix some code that could,
potentially, have given a divide by zero and which therefore
behaves differently with FPU and -ffast-math compilation options.
2013-06-06 [r1384] Andrew M. Bishop <amb>
* src/translations.c: Fix bug if using the built-in translations
for GPX route files (present since v2.0). Make a few other
translations match the ones in the XML file.
2013-06-05 [r1383] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/nodesx.c: Update the node id just before
sorting geographically rather than relying on the pruning process
to do it.
2013-06-05 [r1381-1382] Andrew M. Bishop <amb>
* web/www/routino/index.html, doc/Makefile: Copy the style.css into
the web page documentation directory, fix the link to it from
index.html.
* extras/find-fixme/Makefile, extras/find-fixme/web/www,
extras/find-fixme/web/www/paths.pl,
extras/find-fixme/web/www/index.html (added),
extras/find-fixme/web/www/fixme.html: Add an index.html page to
redirect to fixme.html, copy in a style.css file, slightly change
the web page titles.
2013-06-04 [r1380] Andrew M. Bishop <amb>
* src/waysx.c, src/waysx.h, src/prunex.c: Remember what types of
transports we have so that we don't spend time pruning for
transport types we don't have.
2013-06-04 [r1379] Andrew M. Bishop <amb>
* src/tagging.c: Unconditionally execute the tagging rules within
'<if> ... </if>' even if there are no input tags to match against
the match-all rule.
2013-06-03 [r1377-1378] Andrew M. Bishop <amb>
* extras/find-fixme/fixme-dumper.c, extras/find-fixme/README.txt:
Reinstate the --statistics option.
* extras/find-fixme/web/www/fixme.js: Nicely format the item tag
information.
2013-06-03 [r1374-1376] Andrew M. Bishop <amb>
* extras/find-fixme/fixme.xml, extras/find-fixme/README.txt: Make
it easier to select arbitrary tags and store them.
* extras/find-fixme/osmparser.c: Store a whole XML-like item in the
log file.
* src/tagging.c, src/tagging.h: Add a new function to convert a
TagList into an HTML-like string.
2013-06-03 [r1373] Andrew M. Bishop <amb>
* Makefile.conf: Use the -ffast-math compilation option (trivial
changes to estimated journey times and distances).
2013-06-03 [r1371-1372] Andrew M. Bishop <amb>
* web/bin: Don't ignore tagmodifier (not put here any more).
* extras/find-fixme/Makefile, extras/tagmodifier/Makefile: Compile
all of src directory before starting here.
2013-06-03 [r1370] Andrew M. Bishop <amb>
* src/osmparser.c, src/relationsx.h, extras/find-fixme/osmparser.c,
src/errorlogx.c, src/relationsx.c: Write relation nodes into the
file as well as ways and relations.
2013-06-01 [r1367-1369] Andrew M. Bishop <amb>
* extras/errorlog/README.txt: Make the README files more consistent
with each other in style.
* extras/README.txt, extras/plot-time/README.txt,
extras/tagmodifier/README.txt: Make the README files more
consistent with each other in style.
* extras/find-fixme/fixme-dumper.c (added),
extras/find-fixme/web/www/fixme.js (added),
extras/find-fixme/web/bin (added), extras/find-fixme/web/data
(added), extras/find-fixme/web/www/paths.pl (added),
extras/find-fixme/osmparser.c (added),
extras/find-fixme/fixme-finder.c (added),
extras/find-fixme/web/www/fixme.css (added), extras/find-fixme
(added), extras/find-fixme/web/www (added),
extras/find-fixme/fixme.xml (added),
extras/find-fixme/web/www/fixme.cgi (added),
extras/find-fixme/README.txt (added),
extras/find-fixme/web/www/fixme.html (added),
extras/find-fixme/web (added), extras/find-fixme/Makefile
(added): A tool to search an OSM file for "fixme" tags to create
a database and display them on an interactive map.
2013-06-01 [r1366] Andrew M. Bishop <amb>
* src/planetsplitter.c: Fix minor error with usage message.
2013-06-01 [r1363-1365] Andrew M. Bishop <amb>
* extras/tagmodifier/README.txt, extras/tagmodifier/Makefile:
Compile all main Routino files before trying to build
tagmodifier. Small changes to the README.txt file.
* src/Makefile: Use the WEBBINDIR variable rather than a hard-coded
path.
* doc/Makefile: Make the Makefile clearer with respect to the
copying of HTML files to the web directory.
2013-06-01 [r1361-1362] Andrew M. Bishop <amb>
* src/errorlogx.h, src/planetsplitter.c, src/errorlogx.c: Make the
functions for processing error logs more like the ones for nodes,
ways and relations.
* src/waysx.c, src/nodesx.c, src/relationsx.c: Store the number of
kept nodes, ways and relations when first sorted.
2013-06-01 [r1360] Andrew M. Bishop <amb>
* web/www/routino/visualiser.cgi: Return an error if neither type
of recognised request was made.
2013-05-31 [r1359] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/router.c: Use exit(EXIT_FAILURE)
instead of return(1).
2013-05-31 [r1357-1358] Andrew M. Bishop <amb>
* extras/README.txt, extras/plot-time/README.txt (added),
extras/plot-time/plot-planetsplitter-time.pl (added),
extras/plot-time (added): Add a Perl script that allows plotting
a graph of the time taken to run planetsplitter.
* extras/errorlog/README.txt (added): Add a README file for the
summarise-log.pl script.
2013-05-31 [r1356] Andrew M. Bishop <amb>
* src/osmo5mparse.c, src/osmxmlparse.c, src/osmparser.c,
src/osmparser.h, src/osmpbfparse.c: Move some functions about so
that osmparser.c can be replaced for other types of parsing.
2013-05-31 [r1355] Andrew M. Bishop <amb>
* src/segmentsx.c, src/planetsplitter.c, src/waysx.c: Small changes
to comments and log messages.
2013-05-30 [r1354] Andrew M. Bishop <amb>
* src/segmentsx.c: Don't de-duplicate when sorting segments (now
done in ProcessSegments() function).
2013-05-30 [r1353] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/relationsx.h,
doc/DATALIFE.txt: Merge the ProcessTurnRelations1() and
ProcessTurnRelations2() functions into a single one now that
segment processing is already complete.
2013-05-30 [r1352] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/planetsplitter.c: Move the first
IndexSegments() function call earlier in the sequence.
2013-05-30 [r1351] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
doc/DATALIFE.txt: Merge the RemoveBadSegments() and
MeasureSegments() functions. Saves one read/write iteration
through the segments file.
2013-05-30 [r1350] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/segmentsx.c, src/nodesx.c,
src/segmentsx.h, doc/DATALIFE.txt, src/nodesx.h,
src/relationsx.c: Delete the non-highway nodes by searching for
them in the ways rather than marking them when processing the
segments.
2013-05-29 [r1349] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, extras/errorlog/summarise-log.pl,
src/relationsx.c, src/planetsplitter.c, src/waysx.c,
src/segmentsx.c, src/nodesx.c, src/waysx.h, src/segmentsx.h:
Simplify the segments by using the node and way index instead of
node and way id which avoids lots of IndexNodeX() lookups. Move
some other code around to cope with it.
2013-05-27 [r1348] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/waysx.c, src/waysx.h, doc/DATALIFE.txt:
Simplify the sorting of the way names (only sort the names, not
all the ways twice), merge the generating of segments and
separation of way names.
2013-05-27 [r1347] Andrew M. Bishop <amb>
* src/osmparser.c, src/waysx.c, src/segmentsx.c: Redistributed
error log messages from osmparser way handling.
2013-05-26 [r1346] Andrew M. Bishop <amb>
* extras/errorlog/summarise-log.pl (added), extras/errorlog
(added), extras/README.txt, web/bin/summarise-log.pl (removed):
Move the summarise-log.pl script into the extras directory.
2013-05-26 [r1345] Andrew M. Bishop <amb>
* extras/tagmodifier/README.txt (added),
extras/tagmodifier/tagmodifier.c (added),
extras/tagmodifier/Makefile (added), doc/html/installation.html,
extras/tagmodifier (added), doc/html/usage.html,
extras/README.txt, src/tagmodifier.c (removed), src/Makefile,
src, doc/USAGE.txt, doc/INSTALL.txt: Move the tagmodifier program
into the extras directory.
2013-05-26 [r1344] Andrew M. Bishop <amb>
* extras (added), extras/README.txt (added), extras/Makefile
(added): Create a new directory for extra (non-essential)
programs
2013-05-26 [r1343] Andrew M. Bishop <amb>
* doc/Makefile, src/test/Makefile, src/Makefile, src/xml/Makefile,
doc/INSTALL.txt, Makefile, doc/html/installation.html,
xml/Makefile, Makefile.conf (added): Re-organise the Makefiles so
that all configuration information is one of them (Makefile.conf
at the top level) rather than being spread between them.
2013-05-25 [r1342] Andrew M. Bishop <amb>
* src/errorlogx.c, src/relationsx.c, src/relationsx.h: Rename the
route relation structure parameters (r* -> rr*) to match the turn
relation parameter names (tr*).
2013-05-25 [r1341] Andrew M. Bishop <amb>
* src/errorlogx.c, src/relationsx.c, src/relationsx.h: Finished
allocating coordinates to error logs, nodes in preference to ways
in preference to relations.
2013-05-23 [r1340] Andrew M. Bishop <amb>
* doc/USAGE.txt, src/filedumperx.c, doc/html/usage.html: There are
no segments stored after parsing so cannot be dumper by
filedumperx.
2013-05-23 [r1339] Andrew M. Bishop <amb>
* src/superx.c, src/types.h, src/planetsplitter.c, src/osmparser.c,
src/waysx.c, src/segmentsx.c, src/osmparser.h, src/waysx.h,
src/segmentsx.h, doc/DATALIFE.txt, src/types.c: Don't create
segments when parsing input file but create the segments later
using the nodes stored in the ways file. This makes applying
changes simpler (segments file is not kept with the --keep
option) and handling changed ways is simpler than changed
segments.
2013-05-22 [r1338] Andrew M. Bishop <amb>
* src/osmparser.c, src/waysx.c, src/waysx.h, src/errorlogx.c,
src/filedumperx.c: Store the list of nodes in the raw ways file
for use by the errorlog functions.
2013-05-21 [r1337] Andrew M. Bishop <amb>
* src/sorting.c: Don't waste memory in filesort_vary() when the
pre-sort function drops the data.
2013-05-20 [r1336] Andrew M. Bishop <amb>
* src/osmparser.c: Store more logerror information even for items
that are discarded to allow them to be located geographically.
2013-05-20 [r1335] Andrew M. Bishop <amb>
* src/xml/Makefile: Update CLFLAGS and LDFLAGS.
2013-05-18 [r1334] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, doc/INSTALL.txt,
web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/mapprops.js, doc/html/installation.html,
web/www/routino/visualiser.js: Make the OSM editor URL be
configurable in the mapprops.js file.
2013-05-18 [r1333] Andrew M. Bishop <amb>
* web/www/openlayers/routino.cfg: Need to include
OpenLayers/Control/SelectFeature.js when building OpenLayers.js.
2013-05-18 [r1332] Andrew M. Bishop <amb>
* web/www/routino/visualiser.css, web/www/routino/visualiser.js:
Put the popup colours in the Javascript, not CSS. Set the popup
font (fixed) and size (smaller).
2013-05-18 [r1330-1331] Andrew M. Bishop <amb>
* src/visualiser.c: Remove unused header file.
* src/filedumper.c, doc/USAGE.txt, web/www/routino/visualiser.cgi,
doc/html/usage.html: Create specific HTML formatted output from
filedumper for the visualiser web page.
2013-05-18 [r1329] Andrew M. Bishop <amb>
* web/www/routino/visualiser.cgi, src/visualiser.c,
web/www/routino/visualiser.js: Add the ability to select any item
displayed in the visualiser and display information about it in a
popup.
2013-05-18 [r1327-1328] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/visualiser.js: Don't
display the marker layers in the layer switcher control.
* web/www/routino/visualiser.js: Store the feature attributes using
the feature.attributes object.
2013-05-18 [r1326] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js, web/www/routino/visualiser.css:
Change to using a popup like in the router and highlight the
selected item when the popup is displayed.
2013-05-17 [r1324-1325] Andrew M. Bishop <amb>
* web/www/routino/visualiser.html.en: Selecting the radio buttons
updates the display.
* web/www/routino/router.html.de, web/www/routino/router.html.nl,
web/www/routino/router.html.en: Added some missing ';' to the
Javascript actions in the HTML.
2013-05-17 [r1323] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/USAGE.txt: Add the documentation for the
change to the filedumper program.
2013-05-17 [r1322] Andrew M. Bishop <amb>
* src/visualiser.c: Limit the error log outputs to the geographical
ones and make the strings HTML safe.
2013-05-17 [r1321] Andrew M. Bishop <amb>
* src/errorlog.h, web/www/routino/visualiser.html.en,
src/errorlogx.c, src/visualiser.c, web/www/routino/visualiser.js,
src/planetsplitter.c, src/errorlog.c, src/visualiser.h,
src/Makefile, src/filedumper.c, web/www/routino/visualiser.cgi:
Allow dumping error logs from filedumper.
2013-05-14 [r1320] Andrew M. Bishop <amb>
* src/errorlogx.c, src/errorlogx.h, src/errorlog.c (added),
src/errorlog.h (added): Copy errorlogx.h to errorlog.h and create
errorlog.c so that they mirror the nodes.h and nodes.c filenames.
Add functions to read in a set of error logs from a file.
2013-05-13 [r1319] Andrew M. Bishop <amb>
* src/logerror.c, src/Makefile, src/logerror.h (removed),
src/errorlogx.c (added), src/logerrorx.c (removed),
src/errorlogx.h (added), src/planetsplitter.c: Rename logerrorx.c
to errorlogx.c and logerrorx.h to errorlogx.h so that they mirror
the nodesx.c and nodesx.h filenames.
2013-05-13 [r1318] Andrew M. Bishop <amb>
* src/tagmodifier.c, src/logging.h, src/osmparser.c,
src/segmentsx.c, src/logerror.h, src/tagging.c, src/relationsx.c:
Move the logerror function prototypes back into logging.h and
remove the logerror.h header file from most source files again.
2013-05-12 [r1317] Andrew M. Bishop <amb>
* src/logerror.c, src/waysx.c, src/Makefile, src/relationsx.h,
src/segmentsx.c, src/logerror.h, src/nodesx.c, src/waysx.h,
src/segmentsx.h, src/logerrorx.c (added), src/nodesx.h,
src/relationsx.c, src/planetsplitter.c: Add functions to process
the binary error log file and convert it into a geographically
searchable database.
2013-05-11 [r1314] Andrew M. Bishop <amb>
* src/planetsplitter.c: Rename the Nodes, Segments, Ways and
Relations variables to avoid confusion with types of the same
name.
2013-05-11 [r1313] Andrew M. Bishop <amb>
* src/logerror.h (added), src/tagging.c, src/logging.c,
src/relationsx.c, src/planetsplitter.c, src/tagmodifier.c,
src/logerror.c (added), src/logging.h, src/osmparser.c,
src/Makefile, src/segmentsx.c: Create a binary log file that
contains the node, way and relation id and a link to the error
message for easy parsing.
2013-05-11 [r1312] Andrew M. Bishop <amb>
* src/ways.c, src/relations.h, src/segments.c, src/nodes.c,
src/ways.h, src/segments.h, src/nodes.h, src/relations.c,
src/router.c: Add functions to destroy the
node/segment/way/relation lists and don't call them from the end
of the router by default.
2013-05-10 [r1308-1311] Andrew M. Bishop <amb>
* src/Makefile: Enable -Wextra compilation option (but not
-Wunused-parameter option) by default.
* src/sorting.c: Change data type from signed to unsigned (pedantic
compiler warning).
* src/results.c: Change data value from signed to unsigned
(pedantic compiler warning).
* src/waysx.h, src/segmentsx.h, src/nodesx.h: Make no-op macros
look like real statements.
2013-05-10 [r1305-1307] Andrew M. Bishop <amb>
* src/results.c: Change data value from signed to unsigned
(pedantic compiler warning).
* src/prunex.c: Change data value from unsigned to signed (pedantic
compiler warning).
* src/filedumper.c: Remove always true condition (pedantic compiler
warning).
2013-05-10 [r1304] Andrew M. Bishop <amb>
* src/queue.c: Small change to algorithm to match sorting.c.
2013-05-09 [r1302-1303] Andrew M. Bishop <amb>
* src/relations.c: Change data value from unsigned to signed
(pedantic compiler warning).
* src/planetsplitter.c, src/waysx.c: Change datatype from signed to
unsigned (pedantic compiler warning).
2013-05-09 [r1299-1301] Andrew M. Bishop <amb>
* src/osmpbfparse.c, src/osmo5mparse.c, src/xmlparse.c: Change
datatype from signed to unsigned (pedantic compiler warning). Use
inttypes.h printf formatting for unsigned long long data type.
* src/files.h: Cast data to signed before comparison (pedantic
compiler warning).
* src/filedumperx.c: Change datatype from signed to unsigned
(pedantic compiler warning).
2013-05-07 [r1298] Andrew M. Bishop <amb>
* src/nodes.c: Change the GetLatLong() function to have one binary
search instead of two.
2013-05-07 [r1297] Andrew M. Bishop <amb>
* src/cache.h, src/nodes.c, src/relationsx.c, src/waysx.c,
src/segmentsx.c, src/nodesx.c, src/waysx.h, src/prunex.c,
src/segmentsx.h, src/nodesx.h, src/superx.c: Add cache functions
for NodesX, SegmentsX and WaysX to speed up the planetsplitter in
slim mode.
2013-05-07 [r1296] Andrew M. Bishop <amb>
* src/cache.c (removed), src/relations.h, src/cache.h, src/ways.h,
src/segments.h, src/Makefile, src/nodes.h: Move the cache
functions out of cache.c and into each data type's header file as
inline functions.
2013-05-03 [r1294-1295] Andrew M. Bishop <amb>
* src/cache.c: Revert to the round-robin cache eviction algorithm.
* src/cache.c: Implement an LRU eviction algorithm for the cached
objects - it's slower, but code kept for possible future re-use.
2013-05-03 [r1293] Andrew M. Bishop <amb>
* src/cache.c, src/relations.h, src/cache.h, src/ways.h,
src/segments.h, src/nodes.h: Tidy up the code for the last
check-in and use macros to allow replication of the functions for
each type.
2013-05-03 [r1292] Andrew M. Bishop <amb>
* src/segments.h, src/Makefile, src/nodes.h, src/relations.c,
src/router.c, src/cache.c (added), src/ways.c, src/relations.h,
src/segments.c, src/cache.h (added), src/nodes.c, src/ways.h: Add
node, segment, way and turn relation cache for slim mode. Approx
40% speed-up for router.
2013-05-01 [r1291] Andrew M. Bishop <amb>
* src/output.c, src/router.c, src/segments.c, src/visualiser.c,
src/nodes.c, src/fakes.c, src/optimiser.c, src/filedumper.c,
src/nodes.h: The GetLatLong function takes a pointer to the node
as an argument - must be an optimisation for slim mode if not
normal mode.
2013-05-01 [r1290] Andrew M. Bishop <amb>
* src/results.c, src/queue.c, src/results.h: Move the queue score
back into the results structure since it is quicker but uses
slightly more memory.
2013-05-01 [r1289] Andrew M. Bishop <amb>
* src/queue.c, src/results.h, src/superx.c, src/optimiser.c,
src/results.c: Try to speed up the priority queue by allocating
less memory and storing the score in the queue rather than in the
result.
2013-04-28 [r1288] Andrew M. Bishop <amb>
* src/results.c: Set pointers to NULL when resizing the hash table.
2013-04-27 [r1287] Andrew M. Bishop <amb>
* src/superx.c: Update for change to NewResultsList() function.
2013-04-27 [r1286] Andrew M. Bishop <amb>
* src/optimiser.c, src/results.c, src/results.h: Increase the
starting number of bins to allow more results to be stored before
resizing.
2013-04-27 [r1285] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Use a linked list to store the
results in each bin rather than pre-allocated pointers.
2013-04-27 [r1283-1284] Andrew M. Bishop <amb>
* src/results.c: Improve the hash function to avoid node/segment
correlations in some geographic areas.
* src/router.c: De-allocate the final routes at the end.
2013-04-27 [r1282] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Increase the allowed number of
collisions as the number of bins increases.
2013-04-27 [r1281] Andrew M. Bishop <amb>
* src/results.h, src/optimiser.c, src/router.c, src/results.c:
Remove the FindResult1 function which allows hashing to be
performed on a combination of node and segment rather than just
node.
2013-04-26 [r1280] Andrew M. Bishop <amb>
* src/results.c, src/results.h: Force a hard limit on the number of
hash collisions.
2013-04-20 Andrew M. Bishop <amb>
Version 2.5.1 released
2013-04-20 [r1279] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/NEWS.txt, FILES: Updated for version
2.5.1 release.
2013-04-18 [r1278] Andrew M. Bishop <amb>
* src/router.c, src/optimiser.c, src/functions.h: Fix a bug where
the shortest route crossing super-nodes requires two U-turns and
is therefore impossible to compute even though an obvious shorter
route without crossing super-nodes exists (but cannot be taken
until the super-node route is fully tested). Requires quite a
major change in router handling of this special case.
2013-04-18 [r1277] Andrew M. Bishop <amb>
* src/xmlparse.c: Fix bug with handling UTF-8 characters that are
four bytes long (it didn't since v2.5).
2013-04-17 [r1276] Andrew M. Bishop <amb>
* src/optimiser.c: Fix bug that corrupts the combined route score
when combining the route (only important if comparing
non-super-node route with super-node route).
2013-04-15 [r1275] Andrew M. Bishop <amb>
* web/www/openlayers/install.sh: Default to downloading openlayers
2.12.
2013-04-13 [r1274] Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/html/installation.html: Add a note about the
*-slim executables to the installation section.
2013-04-13 [r1273] Andrew M. Bishop <amb>
* src/tagmodifier.c: Use single quotes rather than double quotes
when writing out the XML for similarity with filedumper.
2013-04-13 [r1272] Andrew M. Bishop <amb>
* src/xmlparse.c: Fix XML character quoting for characters within
the 7-bit printable ASCII range (bug reported by Dirk Eversmann).
2013-04-13 [1271] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/visualiser.js: Fix the
Javascript so that it works with OpenLayers version 2.11 again
(bug reported by Dirk Eversmann).
2013-04-13 [r1269-1270] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/README.txt: Remove some differences
between the HTML and text versions of the documents.
* doc/INSTALL.txt, doc/html/installation.html: Fix some errors in
the installation documents and improve the description of
pre-requisites and compilation (prompted by bug report from Dirk
Eversmann).
2013-03-24 [r1268] Andrew M. Bishop <amb>
* src/planetsplitter.c: Prune the straight highways after removing
the isolated sections and short segments rather than before.
2013-03-19 [r1267] Andrew M. Bishop <amb>
* doc/html/output.html, doc/html/tagging.html,
doc/html/installation.html, doc/html/limits.html, doc/README.txt,
doc/html/usage.html, doc/html/algorithm.html,
doc/html/configuration.html, doc/html/index.html,
doc/html/data.html, doc/html/readme.html,
web/www/routino/index.html: Remove e-mail addresses and replace
with links to website.
2013-03-03 [r1266] Andrew M. Bishop <amb>
* src/prunex.c: Improve the pruning of straight highways (more
likely to remove larger sections).
2013-03-03 [r1265] Andrew M. Bishop <amb>
* src/test, src/prunex.c, src/test/prune-straight.sh (added),
src/test/prune-straight.osm (added): Add a test case for pruning
straight segments. Found an error case related to loops and fixed
it.
2013-03-02 [r1264] Andrew M. Bishop <amb>
* src/test/prune-short.sh (added), src/test,
src/test/prune-short.osm (added), src/prunex.c,
src/test/only-split.sh: Add a test case for pruning short
segments. Found some disallowed cases that had not been detected
before and fixed them.
2013-03-02 [r1263] Andrew M. Bishop <amb>
* doc/html/tagging.html, xml/routino-tagging.xml, doc/TAGGING.txt,
src/osmparser.c, src/filedumper.c: Recognise mini-roundabouts
tagged as junction=roundabout (as well as
highway=mini_roundabout). Pass them through the parser as
roundabout=yes. Output them from the filedumper as
junction=roundabout. Update the documentation for
mini-roundabouts.
2013-03-02 [r1262] Andrew M. Bishop <amb>
* src/test/oneway-loop.osm, src/test/node-restrictions.osm: Remove
the 'update' element from the osm tag.
2013-02-28 [r1261] Andrew M. Bishop <amb>
* src/relationsx.c: Rationalise some of the turn relation error
messages.
2013-02-26 [r1260] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/visualiser.js: Clarify
comment.
2013-02-18 [r1259] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some more tags to not be reported as
errors (barrier, highway), add some more aliases for highway
types, bridges and tunnels are enabled for anything except 'no'.
2013-02-16 [r1257-1258] Andrew M. Bishop <amb>
* web/www/routino/index.html: Move the meta tag for charset
declaration to the top of the head, before the copyright notice,
within the first 1024 bytes.
* doc/html/readme.html, web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, doc/html/output.html,
doc/html/tagging.html, doc/html/installation.html,
doc/html/limits.html, doc/html/usage.html,
doc/html/algorithm.html, doc/html/configuration.html,
doc/html/index.html, web/www/routino/router.html.en,
doc/html/data.html: Move the meta tag for charset declaration to
the top of the head, before the copyright notice, within the
first 1024 bytes.
2013-02-09 [r1256] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Stop two contradictory errors messages
about 'access = foot' etc.
2013-02-09 Andrew M. Bishop <amb>
Version 2.5 released
2013-02-09 [r1255] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/USAGE.txt: Fix HTML validation error.
2013-02-09 [r1254] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/NEWS.txt, doc/README.txt, FILES: Update
documentation for version 2.5.
2013-02-09 [r1253] Andrew M. Bishop <amb>
* doc/html/tagging.html, doc/TAGGING.txt: Update documentation for
the new tagging transformations.
2013-02-09 [r1252] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some more highway tagging
transformations (motorroad, sidewalk, footway, cycleway), remove
some rare bicycle specific ones and add some access tag values.
2013-02-09 [r1251] Andrew M. Bishop <amb>
* src/osmo5mparse.c: Rename the local functions that perform the
integer conversions (from pbf_* to o5m_*).
2013-02-08 [r1250] Andrew M. Bishop <amb>
* web/www/routino/documentation, doc/html/limits.html (added),
doc/html/index.html, doc/LIMITS.txt (added): Add documentation
about the numerical limits (OSM identifiers and database size).
2013-02-03 [r1249] Andrew M. Bishop <amb>
* src/prunex.c: Some trivial changes, same functionality.
2013-01-24 [r1248] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js, src/visualiser.h,
src/filedumper.c, doc/USAGE.txt, web/www/routino/visualiser.cgi,
web/www/routino/visualiser.html.en, src/visualiser.c,
doc/html/usage.html: Add the ability for the visualiser to
display highways that have a particular property.
2013-01-24 [r1247] Andrew M. Bishop <amb>
* doc/html/tagging.html, xml/routino-tagging.xml, doc/TAGGING.txt,
src/osmparser.c: Change the "lanes=..." tag processing because it
counts lanes in both directions. A normal road may be tagged as
having two lanes (one in each direction) but the multilane
property is intended to allow prioritisation of roads where
traffic can use multiple lanes in each direction.
2013-01-21 [r1246] Andrew M. Bishop <amb>
* src/tagging.c, src/osmparser.c: Remove unnecessary word from
logerror messages.
2013-01-21 [r1245] Andrew M. Bishop <amb>
* xml/routino-translations.xml: Updated German translations from
Alex Treiber.
2013-01-20 [r1244] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Change the comments to clarify what the
way access tag rules are for. Change slightly the logged message.
Add new tagging rules to transform (for example) access=foot to
foot=yes, access=no.
2013-01-20 [r1243] Andrew M. Bishop <amb>
* xml/routino-tagging.xml, src/types.c, xml/routino-profiles.xml,
doc/README.txt, doc/html/usage.html, src/types.h,
doc/html/configuration.html, src/osmparser.c,
xml/scripts/ride.pl, web/www/routino/router.html.en,
doc/USAGE.txt, web/www/routino/visualiser.html.en,
doc/CONFIGURATION.txt, web/www/routino/router.html.nl,
doc/html/tagging.html, xml/scripts/walk.pl, src/relationsx.c,
doc/TAGGING.txt, doc/html/readme.html,
web/www/routino/router.html.de: Replace 'motorbike' with
'motorcycle' everywhere.
2013-01-20 [r1242] Andrew M. Bishop <amb>
* doc/CONFIGURATION.txt, xml/routino-tagging.xsd,
xml/routino-tagging.xml, src/tagging.h,
doc/html/configuration.html, src/tagging.c: Change the <logerror>
element of the configuration file to lookup the tag value if not
specified and add a custom error message. Rework the access tag
checking to use the new logcheck.
2013-01-19 [r1241] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Ignore some more highway types ('no' and
'disused').
2013-01-19 [r1240] Andrew M. Bishop <amb>
* web/www/routino/visualiser.html.en: Fix link to documentation
directory.
2013-01-19 [r1239] Andrew M. Bishop <amb>
* web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/mapprops.js, web/www/routino/visualiser.js,
web/www/routino/router.html.en: Added MapQuest as an optional map
layer, added layer specific attributions to mapprops.js.
2013-01-15 [r1238] Andrew M. Bishop <amb>
* web/bin/summarise-log.pl: Fix stupid typo.
2013-01-12 [r1237] Andrew M. Bishop <amb>
* web/bin/summarise-log.pl: Sort the listed nodes, ways or
relations by ID.
2013-01-09 [r1236] Andrew M. Bishop <amb>
* src/osmparser.c: Reset the to/via/from indexes before parsing
each relation.
2012-12-29 [r1235] Andrew M. Bishop <amb>
* src/xmlparse.h, src/osmpbfparse.c, src/osmo5mparse.c,
src/osmxmlparse.c, src/xmlparse.c, src/filedumper.c: Replace the
remaining 'long long' and 'unsigned long long' types with
uint64_t.
2012-12-29 [r1234] Andrew M. Bishop <amb>
* src/osmo5mparse.c, src/osmxmlparse.c, src/tagmodifier.c,
src/osmparser.c, src/osmparser.h, src/tagging.c,
src/osmpbfparse.c, src/tagging.h: Re-factor parsing code to
remove duplicated parts from three parsers (osmo5mparse.c,
osmpbfparse.c and osmxmlparse.c) into a common place
(osmparser.c), also removes lots of global variables. Change the
node, way and relation count to uint64_t instead of index_t to
avoid wrap-around (although it would have been a cosmetic problem
only), also removes dependency on types.h. Make the node, way and
relation counters be 'int64_t' instead of 'long long' in the XML
parsers for consistency with the non-XML parsers.
2012-12-28 [r1233] Andrew M. Bishop <amb>
* src/osmparser.c: Log errors for areas that are oneway.
2012-12-28 [r1232] Andrew M. Bishop <amb>
* src/osmparser.c: Log errors for areas that are not closed.
2012-12-27 [r1231] Andrew M. Bishop <amb>
* src/segmentsx.c, src/osmparser.c, web/bin/summarise-log.pl: Don't
append segments if they are duplicates within a way or have
duplicated nodes. Log errors for middle nodes that repeat within
a way (can be non-trivial unintentional loops).
2012-12-26 [r1230] Andrew M. Bishop <amb>
* src/osmpbfparse.c: Some small changes for similarity with the
O5M/O5C parser.
2012-12-26 [r1229] Andrew M. Bishop <amb>
* doc/ALGORITHM.txt, doc/html/algorithm.html: Remove the
"practicalities" section because it is out of date and not very
relevant.
2012-12-26 [r1228] Andrew M. Bishop <amb>
* src/relationsx.c, src/segmentsx.c: Make the log error messages
more useful when there are missing nodes or ways.
2012-12-24 [r1227] Andrew M. Bishop <amb>
* src/osmparser.h, doc/html/usage.html, src/osmo5mparse.c (added),
src/planetsplitter.c, src/osmparser.c, src/Makefile,
doc/USAGE.txt: Added parsing of O5M/O5C format (a binary format
but otherwise very close to OSM/OSC).
2012-12-24 [r1226] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/osmparser.c, src/osmparser.h,
src/osmpbfparse.c: The PBF format does not support change files
(the 'visible' part of the info message is only for historical
data and not for changes).
2012-12-24 [r1225] Andrew M. Bishop <amb>
* src/osmpbfparse.c: Fix memory allocation error.
2012-12-22 [r1224] Andrew M. Bishop <amb>
* doc/html/usage.html, src/planetsplitter.c, src/tagmodifier.c,
doc/USAGE.txt: Data can no longer be read from stdin for
planetsplitter or tagmodifier.
2012-12-21 [r1223] Andrew M. Bishop <amb>
* web/data/create.sh: Correct the URLs to use to download data.
2012-12-21 [r1221] Andrew M. Bishop <amb>
* doc/html/usage.html, src/osmxmlparse.c, src/planetsplitter.c,
src/osmparser.c, src/Makefile, doc/USAGE.txt, src/osmparser.h,
src/osmpbfparse.c (added): Add a parser for OSM PBF format.
Separate the XML parser from the data processing in osmparser.c.
Update planetsplitter and documentation to use new format.
2012-12-19 [r1219-1220] Andrew M. Bishop <amb>
* src/xmlparse.c: Use 'unsigned char' instead of 'char' for buffer.
Renumber the LEX states to remove hole.
* src/uncompress.c: Trivial change to not set a state variable
where not needed.
2012-12-19 [r1218] Andrew M. Bishop <amb>
* src/osmxmlparse.c (added): Copying osmparser.c to create
osmxmlparse.c for the XML callback functions and shared
variables.
2012-12-17 [r1217] Andrew M. Bishop <amb>
* src/optimiser.c: Refactor to remove duplicated code in each
branch of if statement (in each optimiser loop).
2012-12-17 [r1216] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html:
Reintegrate the changes from 2.4.1 branch back into trunk.
2012-12-15 [r1209] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Fix some errors that appeared in the
tagging file after adding nesting.
2012-12-15 [r1206-1207] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Change the tagging rules to use the
nested <if> rules.
* doc/html/configuration.html, src/tagging.c,
doc/CONFIGURATION.txt, xml/routino-tagging.xsd: Change the
tagging rules to have an <ifnot ...> rule which can also be
nested.
2012-12-15 [r1205] Andrew M. Bishop <amb>
* src/translations.c, xml/routino-translations.xsd: Change one
entry in the translations XSD file that used a different case
from the other defined types (not consistent with other XSD files
but self-consistent).
2012-12-15 [r1204] Andrew M. Bishop <amb>
* src/xml/xsd-to-xmlparser.c, src/osmparser.c, src/tagging.c,
src/translations.c, src/profiles.c: Change the xsd-to-xmlparser
functions to output the source code in the same order as the XSD
file and do not attempt to sort them into reverse order of
reference.
2012-12-15 [r1203] Andrew M. Bishop <amb>
* doc/html/configuration.html, src/tagging.c,
doc/CONFIGURATION.txt, xml/routino-tagging.xml: Change the
tagging rules to use the nested <if> rules.
2012-12-15 [r1200-1202] Andrew M. Bishop <amb>
* src/planetsplitter.c: Change the order of the command line option
parsing to match the program usage output.
* doc/USAGE.txt: Add the --logtime and --errorlog options to
tagmodifier.
* doc/html/usage.html, src/tagmodifier.c: Add the --logtime and
--errorlog options to tagmodifier.
2012-12-15 [r1199] Andrew M. Bishop <amb>
* xml/routino-tagging.xsd, src/tagging.h, src/tagmodifier.c,
src/osmparser.c, src/tagging.c: Allow the tagging rule syntax to
contain nested <if ...> statements.
2012-12-14 [r1197] Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/html/usage.html, src/planetsplitter.c,
src/tagmodifier.c: Update the usage messages and documentation
for bzip2/gzip uncompression.
2012-12-14 [r1196] Andrew M. Bishop <amb>
* src/Makefile, src/uncompress.c, src/uncompress.h,
src/planetsplitter.c, src/tagmodifier.c: Add the ability to read
gzip compressed files when specified by name.
2012-12-13 [r1194-1195] Andrew M. Bishop <amb>
* src/xmlparse.c: Handle the output of the uncompressor where
reading may return only a partial buffer. Makes it more robust
generally against short reads.
* src/Makefile, src/uncompress.c (added), src/uncompress.h (added),
src/planetsplitter.c, src/tagmodifier.c: Add the ability to read
bzip2 compressed files when specified by name.
2012-12-12 [r1192] Andrew M. Bishop <amb>
* src/xml/xsd-to-xmlparser.c, src/planetsplitter.c: Use
STDIN_FILENO instead of 0 for the stdin file descriptor.
2012-12-11 [r1190] Andrew M. Bishop <amb>
* src/xmlparse.c: Reorder if/then/else statements so that most
common ones come first (using profiling when parsing GB OSM
file).
2012-12-11 [r1189] Andrew M. Bishop <amb>
* src/xmlparse.c: Most xml attribute values are ASCII so optimise
for that case.
2012-12-10 [r1188] Andrew M. Bishop <amb>
* src/Makefile: Re-enable the optimisation option.
2012-12-10 [r1185-1187] Andrew M. Bishop <amb>
* src: Change svn ignored files (don't ignore xmlparse.c now).
* src/xml/xsd-to-xmlparser.c, src/planetsplitter.c,
src/tagmodifier.c, src/osmparser.c, src/xml/Makefile,
src/osmparser.h, src/tagging.c, src/xmlparse.h,
src/translations.c, src/profiles.c: New XML parser doesn't use
stdio buffered file access but lower level read functions.
* src/xmlparse.l (removed), src/xmlparse.c (added), src/Makefile:
Remove flex based XML parser and replace with a parser created by
implementing the same lex rules by hand. Operates faster because
tag attributes do not need memory allocated or copying from file
buffer and there are no yylex() function calls/returns.
2012-12-17 Andrew M. Bishop <amb>
Version 2.4.1 released
2012-12-17 [r1214] Andrew M. Bishop <amb>
* doc/html/readme.html, doc/NEWS.txt, doc/README.txt, FILES: Update
for version 2.4.1.
2012-12-17 [r1213] Andrew M. Bishop <amb>
* src/optimiser.c, src/waysx.c, src/segmentsx.c, src/nodesx.c,
src/router.c, src/prunex.c, src/logging.c, src/relationsx.c:
Merge revisions 1191, 1193, 1198, 1208 and 1210 from trunk into
2.4.1 branch.
2012-12-17 [r1210] Andrew M. Bishop <amb>
* src/optimiser.c: Fix the incorrect finish_score variable that was
set to infinite distance and not infinite score (infinte distance
<< infinite score so search was terminating early).
2012-12-15 [r1208] Andrew M. Bishop <amb>
* src/nodesx.c, src/prunex.c, src/relationsx.c, src/waysx.c,
src/segmentsx.c: Stop planetsplitter crashing out in unusual ways
if there is no data.
2012-12-14 [r1198] Andrew M. Bishop <amb>
* src/waysx.c, src/nodesx.c: Don't crash in binary search if no
nodes/ways.
2012-12-13 [r1193] Andrew M. Bishop <amb>
* src/logging.c: Fix bug with printing messages if not to stdout.
2012-12-12 [r1191] Andrew M. Bishop <amb>
* src/router.c: Fix error when searching for default profiles.xml
file.
2012-12-08 Andrew M. Bishop <amb>
Version 2.4 released
2012-12-08 [r1182-1183] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html: Update
for version 2.4.
* doc/TAGGING.txt: Update with the tagging rule changes in this
version.
2012-12-08 [r1181] Andrew M. Bishop <amb>
* src/xmlparse.l, src/xml/test/good.xml,
src/xml/test/bad-cdata-start.xml (removed),
src/xml/test/bad-text-outside.xml (added): Simplify the XML
parser by not handling the CDATA and DOCTYPE sections and also
raise an explicit error for text outside of tags. Modify test
cases for these changes.
2012-12-06 [r1180] Andrew M. Bishop <amb>
* src/xmlparse.l: Some further small changes to pull out bigger
groups of characters (only marginally faster though).
2012-12-05 [r1179] Andrew M. Bishop <amb>
* src/prunex.c: Minor theoretical improvements to pruning (slim
mode is still very slow).
2012-12-05 [r1178] Andrew M. Bishop <amb>
* src/xmlparse.l: Change rules to remove all states that require
backing up (only marginally faster though).
2012-12-05 [r1176-1177] Andrew M. Bishop <amb>
* doc/html/tagging.html: Update with the tagging rule changes in
this version.
* xml/routino-tagging.xml: Small change to the tag processing for
nodes for easier future expansion.
2012-12-01 [r1175] Andrew M. Bishop <amb>
* src/tagging.c: Fix memory leak from making incorrect assumption
when freeing tagging rule.
2012-12-01 [r1174] Andrew M. Bishop <amb>
* src/superx.c, src/translations.h, src/visualiser.c,
src/profiles.h, src/types.h, src/osmparser.c, src/filedumper.c,
src/output.c, src/router.c, src/translations.c, src/profiles.c,
src/types.c: Rename the Way_* enumerated values to Highway_*, add
a new Highway_None type, change the HighwayType() function to
return Highway_None instead of Highway_Count if no match found -
all changes for consistency with similar types and functions.
2012-11-27 [r1173] Andrew M. Bishop <amb>
* src/osmparser.c, web/bin/summarise-log.pl, src/segmentsx.c: Log
an error about duplicated segments within a way while parsing the
OSM instead of later (will have been removed by de-duplication
code before tested later in most cases).
2012-11-27 [r1172] Andrew M. Bishop <amb>
* web/bin/summarise-log.pl: Make the script still work when no
command line argument is used.
2012-11-27 [r1171] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/waysx.c,
src/segmentsx.c, src/nodesx.c: Don't log an error for duplicated
nodes, ways or relations because it can only occur when applying
changes or if using multiple geographically overlapping files and
neither is a data error.
2012-11-21 [r1170] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some more tag checking, accept more
tags.
2012-11-21 [r1169] Andrew M. Bishop <amb>
* src/types.h, src/segmentsx.c: Finally fix the segment area
handling - segments that are areas are discarded in preference to
those that are not (as it was between r914 and r1136) and
segments that are areas don't have the wrong distance (as they
did between r914 and r1136). Revision r1137 correctly changed to
use a flag and fixed the distance bug but then didn't sort using
the new flag. Revision r1153 started sorting using the segment
flags but the area was not the most significant bit so they were
not sorted last. Revision r1164 correctly cleared the area flag
when no longer needed but didn't fix the rest. Revision r1168
reverted r1164 so needed to be re-applied.
2012-11-21 [r1168] Andrew M. Bishop <amb>
* src/prunex.c, src/segmentsx.h, src/filedumperx.c, src/segments.c,
src/superx.c, src/fakes.c, src/types.h, src/segments.h,
src/optimiser.c, src/osmparser.c, src/filedumper.c,
src/segmentsx.c, src/fakes.h, src/output.c: Revert r1164 - some
super-segments are longer than 65535 metres even if no individual
segment is.
2012-11-20 [r1167] Andrew M. Bishop <amb>
* doc/html/usage.html, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c, doc/USAGE.txt,
src/nodesx.c, src/waysx.h, src/segmentsx.h, src/nodesx.h: Rename
the '--preserve' command line option to '--keep' for simplicity.
2012-11-20 [r1166] Andrew M. Bishop <amb>
* src/segmentsx.c, src/nodesx.c, src/prunex.c, src/results.c,
src/sorting.c, src/logging.c, src/superx.c, src/files.h,
src/relationsx.c, src/tagmodifier.c, src/logging.h,
src/optimiser.c, src/osmparser.c, src/waysx.c, src/Makefile:
Replace all assert statements with a custom error message that
explains the cause and suggests a solution.
2012-11-20 [r1165] Andrew M. Bishop <amb>
* src/types.h, src/osmparser.c, src/nodes.h, src/nodesx.c,
src/nodesx.h: Use a specific type for the node flags instead of a
generic uint16_t.
2012-11-20 [r1164] Andrew M. Bishop <amb>
* src/filedumperx.c, src/segments.c, src/superx.c, src/fakes.c,
src/types.h, src/segments.h, src/optimiser.c, src/osmparser.c,
src/filedumper.c, src/segmentsx.c, src/fakes.h, src/output.c,
src/prunex.c, src/segmentsx.h: Replace the 32-bit combined
distance and flags in the segment with 16 bits for each.
2012-11-20 [r1163] Andrew M. Bishop <amb>
* src/relationsx.c, src/relationsx.h, src/typesx.h,
src/filedumperx.c: Tidy up all of the recent code changes -
Rename TurnRestrictRelX structure to TurnRelX.
2012-11-20 [r1162] Andrew M. Bishop <amb>
* src/files.c: Tidy up all of the recent code changes - Fix
comment.
2012-11-20 [r1161] Andrew M. Bishop <amb>
* src/nodesx.c, src/waysx.h, src/segmentsx.h, doc/DATALIFE.txt,
src/nodesx.h, src/superx.c, src/relationsx.c, src/osmparser.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c: Tidy up all of
the recent code changes - change the name of a few of the
functions.
2012-11-20 [r1160] Andrew M. Bishop <amb>
* src/waysx.c, src/relationsx.h, src/segmentsx.c, src/nodesx.c,
src/waysx.h, src/segmentsx.h, src/nodesx.h: Tidy up all of the
recent code changes - change the order of the functions within
the files to a more sensible and consitent order.
2012-11-19 [r1159] Andrew M. Bishop <amb>
* src/osmparser.c: Unconditionally mark ways as deleted if they
have been modified to handle the case when applying more than one
change file if a way is created by the first of the change files
and modified by the second it will not be in the index.
2012-11-19 [r1158] Andrew M. Bishop <amb>
* src/waysx.c, src/waysx.h, src/planetsplitter.c: Do not create the
way indexes when loading the parsed ways to apply changes
(reverses r1145).
2012-11-19 [r1157] Andrew M. Bishop <amb>
* doc/html/usage.html, src/planetsplitter.c, doc/USAGE.txt: Do not
require that --preserve must be used with --parse-only before
changes can be applied (reverses r1151 for the change to
functionality but preserves the changes to the functions that
enable it).
2012-11-19 [r1156] Andrew M. Bishop <amb>
* src/filedumperx.c: Fix bug with dumping ways.
2012-11-19 [r1155] Andrew M. Bishop <amb>
* src/segmentsx.c: De-duplicate segments when sorting only if they
have the same nodes, way and distance - i.e. the same data
imported twice.
2012-11-18 [r1154] Andrew M. Bishop <amb>
* src/osmparser.c: When marking modified nodes as deleted don't
accidentally re-include them as new ways with the deleted flag
set.
2012-11-18 [r1152-1153] Andrew M. Bishop <amb>
* src/segmentsx.c: When sorting segments use the distance flags as
the tie-breaker so that duplicated segments with different flags
get sorted into the same order when applying changes as when not
applying changes.
* src/osmparser.c: Mark modified relations as deleted before
storing the modification to handle the case where the
modification causes it to be invalid and not stored therefore
leaving the old version.
2012-11-18 [r1151] Andrew M. Bishop <amb>
* src/segmentsx.h, src/nodesx.h, src/superx.c, doc/html/usage.html,
src/relationsx.c, src/planetsplitter.c, src/waysx.c,
src/relationsx.h, src/segmentsx.c, doc/USAGE.txt, src/nodesx.c,
src/waysx.h: Using --parse-only and --preserve must sort the data
so that it is ready to apply the changes.
2012-11-17 [r1149-1150] Andrew M. Bishop <amb>
* src/filedumper.c: Some small changes to match the new filedumperx
program.
* src, doc/USAGE.txt, src/filedumperx.c (added),
doc/html/usage.html, src/Makefile, web/bin: Add a new program to
dump the contents of the intermediate files that are generated by
using --preserve or --changes.
2012-11-17 [r1147-1148] Andrew M. Bishop <amb>
* src/waysx.c: Replace a hard-coded constant with the #defined
value it should have been.
* src/relationsx.c: Clear the route relation before adding data to
it so that there are no unused bytes in the structure to get
written to disk (avoid byte-level differences when applying
changes).
2012-11-17 [r1146] Andrew M. Bishop <amb>
* src/nodesx.c, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/segmentsx.c: Suppress some error log messages
when applying changes (false positive duplicate detection due to
modification of existing items).
2012-11-17 [r1144-1145] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/osmparser.c, src/waysx.c, src/waysx.h:
Fix applying changes for ways (highways that have been modified
to be non-highways were not added to the database so the original
remains).
* src/typesx.h, src/types.h: Change the type-casting of some
constants.
2012-11-16 [r1140-1143] Andrew M. Bishop <amb>
* src/xml: Ignore the automatically generated executables from the
new XML Schema.
* xml/routino-osm.xsd, xml/osm.xsd: Changes to comments to make
them more like the OSC files.
* xml/routino-osc.xsd (added), xml/osc.xsd (added): XML Schema for
OSC change files (.osc files) used to create the XML parser.
* doc/html/usage.html, src/relationsx.c, src/types.h,
src/planetsplitter.c, src/osmparser.c, src/waysx.c,
src/segmentsx.c, doc/USAGE.txt, src/nodesx.c, src/osmparser.h,
src/segmentsx.h, doc/DATALIFE.txt: Code to allow adding OSC
change files (.osc files) to an existing set of parsed (and
preserved) data.
2012-11-15 [r1139] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/relationsx.c,
src/planetsplitter.c, src/waysx.c, src/relationsx.h,
src/segmentsx.c, src/nodesx.c, src/waysx.h, src/segmentsx.h:
Fixed the --preserve option.
2012-11-12 [r1138] Andrew M. Bishop <amb>
* src/relationsx.c: Fix mis-use of NO_WAY/NO_WAY_ID and
NO_RELATION/NO_RELATION_ID constants in route relation handling.
2012-11-11 [r1137] Andrew M. Bishop <amb>
* src/types.h, src/osmparser.c, src/segmentsx.c: Mark those
segments that come from ways which are areas with an explicit
flag rather than an implicit one (also fixes a bug).
2012-11-10 [r1136] Andrew M. Bishop <amb>
* src/nodesx.c, src/waysx.h, src/segmentsx.h, src/nodesx.h,
doc/html/usage.html, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c, doc/USAGE.txt:
Added a --preserve option which keeps the raw data files after
parsing, sorting and de-duplication.
2012-11-10 [r1134-1135] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/waysx.c: Don't index the ways in the first
sorting, but wait until after de-duplicating.
* src/relationsx.c: Sort the route relations and remove duplicates.
2012-11-10 [r1133] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
doc/DATALIFE.txt: The MergeSuperSegments function creates the
output file in the sorted order already, there is no need to
re-sort it.
2012-11-10 [r1132] Andrew M. Bishop <amb>
* src/segmentsx.c, src/segmentsx.h, doc/DATALIFE.txt,
src/planetsplitter.c: De-duplicate the super-segments as a
post-processing function after the sort so both operations are
combined in a single function.
2012-11-10 [r1131] Andrew M. Bishop <amb>
* src/segmentsx.h, src/planetsplitter.c, src/segmentsx.c:
De-duplicate the raw segments before any other processing (to
match the node, way and turn relation processing).
2012-11-10 [r1129-1130] Andrew M. Bishop <amb>
* src/planetsplitter.c: Separate the de-duplication of the ways
from the extracting of the names. Use the modified functions for
creating lists of nodes,segments,ways and relations from r1123.
* src/waysx.c, src/waysx.h, doc/DATALIFE.txt: Separate the
de-duplication of the ways from the extracting of the names.
2012-11-08 [r1128] Andrew M. Bishop <amb>
* web/bin/summarise-log.pl: Allow generation of an HTML version of
the log file summary.
2012-11-08 [r1127] Andrew M. Bishop <amb>
* src/osmparser.c: Add two extra parsing rules for feet and inches.
2012-11-04 [r1126] Andrew M. Bishop <amb>
* src/tagging.c: Clarify that errors logged when examining tags
mean that tag will be ignored.
2012-11-04 [r1125] Andrew M. Bishop <amb>
* src/osmparser.c: Log an error for ways with only 1 node and for
relations with no nodes, ways or relations.
2012-11-03 [r1124] Andrew M. Bishop <amb>
* src/prunex.c: Append the new ways directly to the end of the
existing ways rather than using a new file.
2012-11-03 [r1123] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/relationsx.c, src/waysx.c,
src/relationsx.h, src/segmentsx.c, src/nodesx.c, src/waysx.h,
src/segmentsx.h: Don't open the input file for appending if there
is no intention to write anything to it.
2012-11-03 [r1122] Andrew M. Bishop <amb>
* src/superx.c, src/files.h, src/relationsx.c, src/segmentsx.c,
src/prunex.c, src/files.c: Change the UnmapFile() function to
take a pointer to the data instead of the filename (like the
CloseFile() function takes the file descriptor).
2012-11-02 [r1121] Andrew M. Bishop <amb>
* src/prunex.c, src/segmentsx.h: Fix a bug which gave different
results for slim mode and normal mode when pruning short
segments.
2012-11-01 [r1120] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/waysx.c, src/relationsx.h,
src/segmentsx.c, doc/USAGE.txt, src/nodesx.c, src/waysx.h,
src/prunex.c, src/segmentsx.h, src/nodesx.h, src/superx.c,
doc/html/usage.html, src/relationsx.c: Introduce a new'--append'
option for appending data from a file to the currently parsed
data. Rename the intermediate file used for storing data to be
appended to. Add a function to call after appending to a file
which closes the file and renames it to a temporary filename
which is used for the remaining processing.
2012-11-01 [r1119] Andrew M. Bishop <amb>
* src/files.c, src/files.h: Add a function to rename a file.
2012-10-31 [r1118] Andrew M. Bishop <amb>
* src/relationsx.c, src/sorting.h, src/waysx.c, src/segmentsx.c,
src/nodesx.c: Add the option for the sorting function to preserve
the input order of equivalent items on the output. Use this
feature in sorting so that slim mode and normal mode give the
same results.
2012-10-24 [r1116-1117] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/html/algorithm.html,
src/planetsplitter.c, doc/USAGE.txt, doc/ALGORITHM.txt,
src/prunex.c: Perform the pruning for isolated regions in terms
of each transport type individually.
* doc/DATALIFE.txt: Use the index provided by the pre-sort function
rather than the way's internal id when pruning/compacting.
2012-10-24 [r1114-1115] Andrew M. Bishop <amb>
* src/segmentsx.c: Remove a debugging print statement.
* src/waysx.c: Use the index provided by the pre-sort function
rather than the way's internal id when pruning/compacting.
2012-10-22 [r1112-1113] Andrew M. Bishop <amb>
* src/waysx.c: Use the new pre-sort function to allow CompactWays()
to delete the unused segments before sorting them.
* src/segmentsx.c, src/sorting.c, src/relationsx.c: Fix bug with
index parameter in new pre-sort function and change comments to
clarify.
2012-10-22 [r1110-1111] Andrew M. Bishop <amb>
* src/segmentsx.c: Use the new pre-sort function to allow
RemovePrunedSegments() to delete the pruned segments before
sorting them.
* src/segmentsx.c, src/relationsx.c: Change the message after
sorting geographically to be consistent with others.
2012-10-21 [r1109] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/nodesx.c, doc/DATALIFE.txt,
src/nodesx.h: Move the UpdateNodes() work into the callback for
SortNodeListGeographically() and use firstnode when saving the
nodes.
2012-10-21 [r1108] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/relationsx.h, doc/DATALIFE.txt,
src/relationsx.c: Use the new pre-sort function to allow
UpdateTurnRelations() and SortTurnRelationList() to be combined
into a single SortTurnRelationListGeographically() function that
only reads and writes the data once instead of twice.
2012-10-21 [r1107] Andrew M. Bishop <amb>
* src/segmentsx.h, doc/DATALIFE.txt, src/planetsplitter.c,
src/segmentsx.c: Use the new pre-sort function to allow
UpdateSegments() and SortSegmentList() to be combined into a
single SortSegmentListGeographically() function that only reads
and writes the data once instead of twice.
2012-10-21 [r1106] Andrew M. Bishop <amb>
* src/nodesx.c, src/sorting.c, src/relationsx.c, src/sorting.h,
src/waysx.c, src/segmentsx.c: Change the sorting functions to
have a pre-sort and post-sort selection function instead of just
a post-selection one (this will allow deletion of some items
before sorting instead of after sorting in some cases).
2012-10-21 [r1103-1105] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Added new columns showing when the data files
are mapped into memory.
* src/waysx.c: Delete the onumber parameter from the Ways file
header. Don't map the ways file into memory when writing the
ways.
* src/ways.h, src/filedumper.c: Delete the onumber parameter from
the Ways file header.
2012-10-21 [r1102] Andrew M. Bishop <amb>
* src/segmentsx.c: Reallocate the firstnode array when indexing
segments because there may be fewer nodes now.
2012-10-21 [r1101] Andrew M. Bishop <amb>
* src/nodesx.c: Remove some unused parts of the
SortNodeListGeographically() function.
2012-10-20 [r1100] Andrew M. Bishop <amb>
* doc/DATALIFE.txt, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/segmentsx.c, src/waysx.h, src/segmentsx.h: Move
the compacting of the ways back to the top, delete the unused
ways at this point and also call the function again after pruning
segments.
2012-10-20 [r1099] Andrew M. Bishop <amb>
* src/nodesx.c: Mark pruned nodes in the node index.
2012-10-20 [r1098] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/relationsx.h,
src/segmentsx.c, src/nodesx.c, src/prunex.c, doc/DATALIFE.txt,
src/nodesx.h, src/superx.c: Delete the pruned nodes before
searching for super-nodes etc.
2012-10-20 [r1097] Andrew M. Bishop <amb>
* src/nodesx.c: Move the calculation of lat/long extents to the
UpdateNodes() function.
2012-10-20 [r1096] Andrew M. Bishop <amb>
* doc/DATALIFE.txt: Add missing data (nodesx->super).
2012-10-20 [r1095] Andrew M. Bishop <amb>
* doc/DATALIFE.txt (added): A description of the data lifetime in
the planetsplitter program (as an aid to understanding it better
and not messing it up when editing it).
2012-10-19 [r1094] Andrew M. Bishop <amb>
* src/waysx.c: Remove one filesort and one read through the ways
file when compacting.
2012-10-19 [r1093] Andrew M. Bishop <amb>
* src/waysx.c, src/segmentsx.c, src/waysx.h: Change to an external
index for the compacted ways.
2012-10-18 [r1092] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/waysx.c, src/waysx.h: When compacting
ways exclude the ones that are not used by any segments.
2012-10-17 [r1091] Andrew M. Bishop <amb>
* src/planetsplitter.c: Perform the Way compacting at the end
(after pruning segments).
2012-10-17 [r1090] Andrew M. Bishop <amb>
* src/waysx.h, src/waysx.c, src/segmentsx.c: Rename the WayX->prop
entry to WayX->cid to disambiguate it.
2012-10-17 [r1089] Andrew M. Bishop <amb>
* src/typesx.h, src/superx.c: Rename the BitMask functions to set
or clear all bits.
2012-09-28 [r1078] Andrew M. Bishop <amb>
* src/ways.c, src/segments.c, src/visualiser.c, src/nodes.c,
src/ways.h, src/fakes.c, src/segments.h, src/optimiser.c,
src/filedumper.c, src/fakes.h, src/output.c: Rename some
variables so that pointers to nodes, segments, ways and relations
use the Hungarian notation "p" suffix (only applies to the
router, not planetsplitter).
2012-07-22 [r1027-1028] Andrew M. Bishop <amb>
* web/www/routino/noscript.cgi (removed),
web/www/routino/noscript.html (removed),
web/www/routino/noscript.template.html (removed): Delete obsolete
noscript web pages and CGIs.
* web/www/routino/customvisualiser.cgi (removed),
web/www/routino/customrouter.cgi (removed): Delete obsolete
custom* CGIs.
2012-10-06 Andrew M. Bishop <amb>
Version 2.3.2 released
2012-10-06 [r1083] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html: Update
for 2.3.2 release.
2012-10-02 [r1079] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Make the access tag normalisation
consistent between nodes an ways.
2012-09-26 [r1077] Andrew M. Bishop <amb>
* src/visualiser.c, web/www/routino/visualiser.js,
src/visualiser.h, src/filedumper.c,
web/www/routino/visualiser.cgi,
web/www/routino/visualiser.html.en: Add an option to the
visualiser to display nodes that disallow selected transport
type.
2012-09-25 [r1076] Andrew M. Bishop <amb>
* doc/OUTPUT.txt, doc/html/output.html: Change the example output
now that the copyright notice has changed, the final turn is no
longer missed and minor junctions are formatted differently in
the all text format.
2012-09-23 [r1075] Andrew M. Bishop <amb>
* src/test/expected/turns-WP08.txt,
src/test/expected/turns-WP09.txt,
src/test/expected/dead-ends-WP10.txt,
src/test/expected/dead-ends-WP11.txt,
src/test/expected/loops-WP01.txt,
src/test/expected/loops-WP02.txt,
src/test/expected/loops-WP03.txt,
src/test/expected/loops-WP04.txt,
src/test/expected/loops-WP05.txt,
src/test/expected/loops-WP06.txt,
src/test/expected/loops-WP07.txt,
src/test/expected/loops-WP08.txt,
src/test/expected/loops-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,
src/test/expected/turns-WP16.txt,
src/test/expected/dead-ends-WP01.txt,
src/test/expected/dead-ends-WP02.txt,
src/test/expected/dead-ends-WP03.txt,
src/test/expected/dead-ends-WP04.txt,
src/test/expected/dead-ends-WP05.txt,
src/test/expected/dead-ends-WP06.txt,
src/test/expected/dead-ends-WP07.txt,
src/test/expected/dead-ends-WP08.txt,
src/test/expected/dead-ends-WP09.txt,
src/test/expected/loops-WP10.txt,
src/test/expected/loops-WP11.txt, src/output.c,
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: Change the all text output
format so that minor junctions (where no turn instructions are
output for the HTML) are labelled differently. This also required
the expected results for the tests cases to be changed.
2012-09-22 [r1074] Andrew M. Bishop <amb>
* src/test/expected/super-or-not-WP02.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,
src/test/expected/turns-WP16.txt,
src/test/expected/dead-ends-WP01.txt,
src/test/expected/dead-ends-WP02.txt,
src/test/expected/dead-ends-WP03.txt,
src/test/expected/dead-ends-WP04.txt,
src/test/expected/dead-ends-WP05.txt,
src/test/expected/dead-ends-WP06.txt,
src/test/expected/dead-ends-WP07.txt,
src/test/expected/dead-ends-WP08.txt,
src/test/expected/dead-ends-WP09.txt,
src/test/expected/loops-WP10.txt,
src/test/expected/loops-WP11.txt, src/output.c,
src/test/expected/oneway-loop-WP01.txt,
src/test/expected/node-restrictions-WP01.txt,
src/test/expected/turns-WP01.txt,
src/test/expected/node-restrictions-WP02.txt,
src/test/expected/turns-WP02.txt,
src/test/expected/node-restrictions-WP03.txt,
src/test/expected/turns-WP03.txt,
src/test/expected/node-restrictions-WP04.txt,
src/test/expected/turns-WP04.txt,
src/test/expected/node-restrictions-WP05.txt,
src/test/expected/turns-WP05.txt,
src/test/expected/node-restrictions-WP06.txt,
src/test/expected/turns-WP06.txt,
src/test/expected/node-restrictions-WP07.txt,
src/test/expected/turns-WP07.txt,
src/test/expected/node-restrictions-WP08.txt,
src/test/expected/turns-WP08.txt,
src/test/expected/turns-WP09.txt,
src/test/expected/dead-ends-WP10.txt,
src/test/expected/dead-ends-WP11.txt,
src/test/expected/loops-WP01.txt,
src/test/expected/loops-WP02.txt,
src/test/expected/loops-WP03.txt,
src/test/expected/loops-WP04.txt,
src/test/expected/loops-WP05.txt,
src/test/expected/loops-WP06.txt,
src/test/expected/loops-WP07.txt,
src/test/expected/loops-WP08.txt,
src/test/expected/loops-WP09.txt: Fix a bug that stopped the last
turn before a waypoint from being described in the HTML output if
the final section of the route was a fake-segment. Update the
test case expected results since the last turn was not being
described properly.
2012-09-20 [r1073] Andrew M. Bishop <amb>
* src/test/start-1-finish.sh, src/test/a-b-c.sh, src/test/a-b.sh:
Change the scripts for the test cases to use 'diff' instead of
'cmp' so that it is possible to see the changes.
2012-09-19 [r1071-1072] Andrew M. Bishop <amb>
* src/router.c: Change the error message printed if a super-route
cannot be converted into a normal route.
* src/superx.c: When not marking nodes that allow no traffic as
super-nodes don't route through them when calculating
super-segments.
2012-09-18 [r1070] Andrew M. Bishop <amb>
* xml/routino-translations.xml: Change the URL for the
license/copyright file (not CC specific and points to
openstreetmap site).
2012-09-17 [r1069] Andrew M. Bishop <amb>
* src/superx.c, src/test/node-restrictions.osm, src/types.h,
src/test/expected/node-restrictions-WP04.txt: Do not mark
barriers that cannot be passed by any type of transport as
super-nodes.
2012-09-16 [r1068] Andrew M. Bishop <amb>
* src/test/expected/node-restrictions-WP06.txt (added),
src/test/node-restrictions.sh (added),
src/test/expected/node-restrictions-WP07.txt (added),
src/test/expected/node-restrictions-WP08.txt (added),
src/test/node-restrictions.osm (added), src/optimiser.c,
src/test/expected/node-restrictions-WP01.txt (added), src/test,
src/test/expected/node-restrictions-WP02.txt (added),
src/test/expected/node-restrictions-WP03.txt (added),
src/test/expected/node-restrictions-WP04.txt (added),
src/test/expected/node-restrictions-WP05.txt (added): Don't fail
to route if a selected waypoint is a node that does not permit
chosen traffic type. Add test cases for this change.
2012-09-13 [r1067] Andrew M. Bishop <amb>
* src/test/oneway-loop.osm, src/test/invalid-turn-relations.osm,
src/test/turns.osm: Make every test case loadable in JOSM.
2012-09-13 [r1066] Andrew M. Bishop <amb>
* src/superx.c, src/optimiser.c: Update some comments and make a
few very small optimisations.
2012-09-10 [r1065] Andrew M. Bishop <amb>
* src/relationsx.c, src/waysx.c: Tidy up relation expression.
2012-09-10 [r1064] Andrew M. Bishop <amb>
* src/relationsx.c: Log an error if a foot/bicycle way doesn't
allow foot/bicycle transport (it already overrides the way
tagging but didn't warn).
2012-09-09 [r1062-1063] Andrew M. Bishop <amb>
* src/optimiser.c: Refactor the code for the previous change.
* src/superx.c: Tiny optimisation to super-segment calculation.
2012-09-08 [r1058-1061] Andrew M. Bishop <amb>
* src/optimiser.c: Fix the FindSuperSegment() function for routing
problem.
* src/test: Ignore new log files.
* src/test/Makefile: Fixed a spelling mistake in the printed
output.
* src/test/oneway-loop.osm (added),
src/test/expected/oneway-loop-WP01.txt (added),
src/test/oneway-loop.sh (added): Added a new test case for a
real-life pathological routing problem involving oneway streets
and loops.
2012-08-12 [r1057] Andrew M. Bishop <amb>
* src/visualiser.c: Fix for highway type visualiser (was missing
one-way segments).
2012-08-11 Andrew M. Bishop <amb>
Version 2.3.1 released
2012-08-11 [r1050] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.de,
web/www/routino/router.html.nl: Revert the change to waypoint
table widths.
2012-08-11 [r1049] Andrew M. Bishop <amb>
* web/www/routino/router.pl: Fix for older versions of Perl that
don't accept certain anonymous list syntax.
2012-08-11 [r1048] Andrew M. Bishop <amb>
* doc/README.txt, FILES, doc/html/readme.html, doc/NEWS.txt:
Updated for version 2.3.1.
2012-08-11 [r1047] Andrew M. Bishop <amb>
* web/www/routino/router.pl, web/www/routino/router.js,
web/www/routino/router.html.nl, web/www/routino,
web/www/routino/visualiser.js,
web/www/routino/icons/create-icons.pl,
web/www/routino/maplayout.css, src/xml/Makefile, src/Makefile,
web/www/routino/router.css, web/www/routino/router.html.de,
web/www/routino/icons, src/xmlparse.l,
web/www/routino/router.cgi, src/test/Makefile,
web/www/routino/router.html.en, src: Merge the changes from trunk
version into version 2.3.1 branch.
2012-08-06 [r1044-1045] Andrew M. Bishop <amb>
* src/test/Makefile, src/Makefile, src/xml/Makefile: Be more
consistent about what files to clean up.
* src/xmlparse.l: Allow an unlimited number of attributes per tag
without crashing.
2012-08-04 [r1043] Andrew M. Bishop <amb>
* web/www/routino/router.pl, web/www/routino/router.js,
web/www/routino/router.cgi: Don't send back the unused lines from
the router CGI, add the complete command line and execution time
to the log file.
2012-08-03 [r1040] Andrew M. Bishop <amb>
* web/www/routino/router.html.de, web/www/routino/router.html.nl,
web/www/routino/maplayout.css, web/www/routino/router.html.en,
web/www/routino/router.css: Force the font size in pixels and
adjust the table width so that user browser preferences don't
destroy layout (using small or large font).
2012-08-03 [r1039] Andrew M. Bishop <amb>
* web/www/routino/router.js: Fix some bugs in the latest check-ins.
2012-08-03 [r1038] Andrew M. Bishop <amb>
* web/www/routino/router.html.de, web/www/routino/router.html.nl,
web/www/routino/router.js, web/www/routino/router.html.en: Add a
button to close the loop (duplicate the first waypoint at the
end).
2012-08-03 [r1037] Andrew M. Bishop <amb>
* web/www/routino/router.js: Don't add the waypoint items at the
start and hide them if not needed but make them invisible to
start with and display them if required.
2012-08-03 [r1036] Andrew M. Bishop <amb>
* web/www/routino/router.js: Improve the way that the home marker
is handled (dragging etc).
2012-08-03 [r1035] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js, web/www/routino/router.js: Add
comments to the functions that are called from the HTML file (to
simplify debugging and make easier to maintain).
2012-08-02 [r1034] Andrew M. Bishop <amb>
* web/www/routino/router.js: Never-used markers now show as blank,
not 0,0. Clicking an unused marker centres it on the map and
updates the coordinates.
2012-08-02 [r1033] Andrew M. Bishop <amb>
* web/www/routino/router.js: Refactor the code that inserts,
removes and moves markers around so that all properties are moved
including search/coords selection, search values etc.
2012-08-02 [r1032] Andrew M. Bishop <amb>
* web/www/routino/router.js: Change the formSetCoords() function so
that it doesn't change the active state.
2012-07-31 [r1030-1031] Andrew M. Bishop <amb>
* web/www/routino/icons: Generate the full set of icons and ignore
them from SVN.
* web/www/routino/icons/create-icons.pl: Create more limit markers
for the visualiser.
2012-07-22 [r1029] Andrew M. Bishop <amb>
* web/www/routino/icons/create-icons.pl: Create
marker-XXX-(red|grey).png icons which can get requested before
the Javascript removes them.
2012-07-21 Andrew M. Bishop <amb>
Version 2.3 released
2012-07-21 [r1026] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html: Update
to version 2.3.
2012-07-21 [r1025] Andrew M. Bishop <amb>
* src/osmparser.c: Fix problem with not logging all invalid tags.
Minor optimisation to speed up tag recognition.
2012-07-17 [r1023-1024] Andrew M. Bishop <amb>
* doc/html/output.html: Change the comment describing the
parameters for the example route.
* doc/html/usage.html, doc/USAGE.txt: Add a note that too many
threads and not enough memory will slow down planetsplitter
operation.
2012-07-17 [r1022] Andrew M. Bishop <amb>
* src/xmlparse.l: Some small lex changes and an optimisation to
remove repeated memory allocation.
2012-07-16 [r1021] Andrew M. Bishop <amb>
* src/sorting.c: Restore the shortcut that doesn't write the data
to a temporary file if it all can be sorted in one go. This
removes the slowdown with the multi-threaded code even when
running with no threads.
2012-07-15 [r1020] Andrew M. Bishop <amb>
* src/sorting.c: Don't call any of the pthread functions unless
running with multiple threads.
2012-07-14 [r1019] Andrew M. Bishop <amb>
* src/logging.c: Default not to use the --logtime option.
2012-07-12 [r1018] Andrew M. Bishop <amb>
* web/www/routino/router.js: Another change related to OpenLayers
2.12.
2012-07-11 [r1017] Andrew M. Bishop <amb>
* src/prunex.c: Fix bug with pruning straight highways
(uninitialised data).
2012-07-10 [r1016] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.de,
web/www/routino/router.html.nl, web/www/routino/router.js:
Trigger the search form only when pressing the return key.
2012-07-10 [r1014-1015] Andrew M. Bishop <amb>
* web/www/routino/page-elements.js: Remove some temporary variables
by combining statements.
* web/www/routino/visualiser.js: A change that should have been in
r985.
2012-07-09 [r1013] Andrew M. Bishop <amb>
* web/www/openlayers/routino.cfg, web/www/routino/visualiser.js,
web/www/routino/router.js: Make compatible with OpenLayers
version 2.12 (but don't default to using it).
2012-07-09 [r1012] Andrew M. Bishop <amb>
* doc/INSTALL.txt, web/www/routino/router.js,
web/www/routino/mapprops.js: Move the maxmarkers variable from
router.js to mapprops.js.
2012-06-30 [r1011] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/visualiser.js: Remove
some temporary variables by combining statements.
2012-06-29 [r1010] Andrew M. Bishop <amb>
* web/www/routino/router.html.de,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/router.html.en: Fix HTML so that it validates.
2012-06-29 [r1009] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/visualiser.js: Be more
consistent with the .transform() operation.
2012-06-29 [r1008] Andrew M. Bishop <amb>
* web/www/routino/router.js, web/www/routino/search.pl,
web/www/routino/search.cgi: Pass bounding box to search to help
find local places. Properly URI encode search strings. Properly
check CGI parameters.
2012-06-29 [r1007] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.css,
web/www/routino/router.html.de, web/www/routino/router.html.nl:
Remove all style definitions from HTML files except for
"display:none".
2012-06-29 [r1005-1006] Andrew M. Bishop <amb>
* web/www/routino/icons/waypoint-coords.png,
web/www/routino/icons/waypoint-search.png: Fix icons to have
transparent background.
* web/www/routino/router.html.de, web/www/routino/router.html.nl,
web/www/routino/router.js, web/www/routino/search.pl,
web/www/routino/router.html.en, web/www/routino/search.cgi,
web/www/routino/router.css, doc/INSTALL.txt: Display all of the
search results and allow the user to select one.
2012-06-05 [r1004] Andrew M. Bishop <amb>
* web/www/routino/search.pl, web/www/routino/router.cgi,
web/www/routino/results.cgi, web/www/routino/search.cgi,
web/www/routino/visualiser.cgi, web/www/routino/router.pl,
web/www/routino/statistics.cgi: Made some of the perl variables
scope-local and checked other perl functions.
2012-06-05 [r1003] Andrew M. Bishop <amb>
* src/visualiser.c, doc/html/usage.html,
web/www/routino/visualiser.js, src/visualiser.h,
src/filedumper.c, doc/USAGE.txt, web/www/routino/visualiser.cgi,
web/www/routino/visualiser.html.en: Add an option to the
visualiser to display segments of each of the highway types.
2012-06-05 [r1002] Andrew M. Bishop <amb>
* src/visualiser.h, src/filedumper.c, doc/USAGE.txt,
web/www/routino/visualiser.cgi,
web/www/routino/visualiser.html.en,
web/www/routino/visualiser.css, src/visualiser.c,
doc/html/usage.html, web/www/routino/visualiser.js: Add an option
to the visualiser to display segments accessible to each of the
transport types.
2012-06-05 [r1001] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/search.cgi
(added), web/www/routino/router.css, web/www/routino/paths.pl,
web/www/routino/router.html.de,
web/www/routino/icons/waypoint-search.png (added),
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/icons/waypoint-coords.png (added),
web/www/routino/search.pl (added): Add a button to replace the
lat/long text entry with a location search entry. Use Nominatim
service via CGI to get first search result and fill in coords.
2012-06-04 [r999-1000] Andrew M. Bishop <amb>
* web/www/routino/results.cgi: No need to include paths.pl.
* doc/html/installation.html: Move the filename prefix parameter to
the paths.pl script with the other user-editable parameters.
2012-06-04 [r998] Andrew M. Bishop <amb>
* doc/INSTALL.txt, web/www/routino/paths.pl,
web/www/routino/router.pl: Move the filename prefix parameter to
the paths.pl script with the other user-editable parameters.
2012-06-04 [r997] Andrew M. Bishop <amb>
* web/www/routino/router.pl: On OSX the md5 program is called "md5"
and not "md5sum".
2012-05-10 [r996] Andrew M. Bishop <amb>
* src/sorting.c: Added some mutexes and condition variables to
communicate between threads.
2012-05-09 [r995] Andrew M. Bishop <amb>
* src/relationsx.c: Force bicycle routes to be bicycle accessible
and foot routes to be foot accessible.
2012-05-08 [r994] Andrew M. Bishop <amb>
* web/www/routino/router.html.de: Merge in the changes to the HTML
template.
2012-05-08 [r993] Andrew M. Bishop <amb>
* web/www/routino/router.html.de: Make link to documentation a
relative one rather than to the Routino website.
2012-05-08 [r992] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.de
(added), web/www/routino/router.html.nl: Add a German language
router webpage, and links to it from the other ones (patch from
Andreas Matthus).
2012-05-02 [r991] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/Makefile, doc/USAGE.txt, src/sorting.c,
doc/html/usage.html: Convert sorting algorithms to optionally use
multiple threads.
2012-05-01 [r990] Andrew M. Bishop <amb>
* xml/routino-osm.xsd, xml/osm.xsd, src/osmparser.c: Handle OSM
files that contain changesets.
2012-04-29 [r989] Andrew M. Bishop <amb>
* src/planetsplitter.c: Handle the --process-only and --parse-only
options better.
2012-04-01 [r988] Andrew M. Bishop <amb>
* web/www/routino/customvisualiser.cgi,
web/www/routino/customrouter.cgi: Don't even bother checking the
legality of the parameters since the JavaScript does that.
2012-04-01 [r987] Andrew M. Bishop <amb>
* web/www/routino/icons, web/www/routino/router.html.nl,
web/www/routino/router.js, web/www/routino/icons/create-icons.pl,
web/www/routino/router.html.en: The number of waypoints is
controlled by the JavaScript and they are automatically inserted
so there is no need to insert multiple lines in the HTML.
2012-03-31 [r986] Andrew M. Bishop <amb>
* web/www/routino/router.html.en,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/visualiser.js: Update the link URLs just-in-time
rather than every time the map moves or parameters are changed.
2012-03-24 [r985] Andrew M. Bishop <amb>
* web/www/routino/visualiser.js,
web/www/routino/customvisualiser.cgi,
web/www/routino/router.html.en,
web/www/routino/visualiser.html.en,
web/www/routino/router.html.nl, web/www/routino/router.js,
web/www/routino/customrouter.cgi: Process the URL query string in
the Javascript not in custom*.cgi. Refactor a lot of the code for
coordinate handling. Simplify custom*.cgi so that they just
redirect to the HTML page (will be removed in later versions -
for existing link compatibility only).
2012-03-23 [r984] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.nl,
web/www/routino/router.js: Added new buttons to centre map on
marker and to add coordinates for current location (Javascript
geolocation function). Shuffled the existing buttons around.
Allow "up" on first marker and "down" on last marker to wrap
around.
2012-03-23 [r983] Andrew M. Bishop <amb>
* web/www/routino/icons/waypoint-locate.png (added),
web/www/routino/icons/waypoint-recentre.png (added),
web/www/routino/icons/waypoint-down.png,
web/www/routino/icons/waypoint-add.png,
web/www/routino/icons/waypoint-home.png,
web/www/routino/icons/waypoint-remove.png,
web/www/routino/icons/waypoint-centre.png,
web/www/routino/icons/waypoint-up.png: Enlarged the button icons,
changed some and added two new ones.
2012-03-17 [r982] Andrew M. Bishop <amb>
* src/logging.c, doc/html/usage.html, src/planetsplitter.c,
src/logging.h, doc/USAGE.txt: Add a new '--logtime' option that
prints the elapsed time for planetsplitter.
2012-03-03 Andrew M. Bishop <amb>
Version 2.2 released
2012-03-03 [r978-981] Andrew M. Bishop <amb>
* doc/html/output.html: Updated to version 2.2.
* doc/html/readme.html: Updated to version 2.2.
* doc/README.txt, FILES: Updated to version 2.2.
* doc/NEWS.txt: Updated to version 2.2.
2012-02-21 [r977] Andrew M. Bishop <amb>
* src/prunex.c: Refactor code slightly for isolated regions.
2012-02-21 [r976] Andrew M. Bishop <amb>
* src/prunex.c: Re-arrange small sections of code based on results
of profiling.
2012-02-21 [r975] Andrew M. Bishop <amb>
* src/test/a-b-c.sh, src/test/a-b.sh, doc/html/usage.html,
src/planetsplitter.c, src/test/Makefile, src/test, doc/USAGE.txt,
src/test/start-1-finish.sh, src/test/only-split.sh: Enable
pruning by default. Fix the test cases to run with and without
pruning but only compare against the expected results when not
pruned.
2012-02-20 [r974] Andrew M. Bishop <amb>
* src/planetsplitter.c: Prune straight highways then isolated
regions and then short segments.
2012-02-20 [r973] Andrew M. Bishop <amb>
* src/prunex.c: Remove compiler warnings (when compiled with
optimisation).
2012-02-20 [r972] Andrew M. Bishop <amb>
* src/prunex.c: Allow pruning isolated regions to be run second or
later.
2012-02-20 [r971] Andrew M. Bishop <amb>
* src/prunex.c: Don't remove nodes/segments when straightening ways
if it would cause the loss of a way name.
2012-02-19 [r970] Andrew M. Bishop <amb>
* src/prunex.c: Some fixes to be able to process the whole of the
UK.
2012-02-18 [r969] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/ALGORITHM.txt: Add a general
description of data pruning.
2012-02-18 [r968] Andrew M. Bishop <amb>
* src/prunex.c: Fix bug with pruning that caused super-node search
to fail.
2012-02-18 [r967] Andrew M. Bishop <amb>
* src/prunex.c: Refactored the code for straight highways and made
improvements.
2012-02-18 [r966] Andrew M. Bishop <amb>
* src/prunex.h, doc/html/usage.html, src/planetsplitter.c,
doc/USAGE.txt, src/prunex.c: Prune nodes in the middle of
straight highways.
2012-02-12 [r965] Andrew M. Bishop <amb>
* src/nodesx.h: Need 3 cached nodes for slim mode.
2012-02-11 [r964] Andrew M. Bishop <amb>
* doc/html/usage.html, src/planetsplitter.c, src/segments.h,
doc/USAGE.txt, src/waysx.h, src/prunex.c, src/segmentsx.h: Prune
short segments.
2012-02-09 [r963] Andrew M. Bishop <amb>
* src/prunex.h, src/planetsplitter.c, src/prunex.c: Prune isolated
segments if they cannot be routed to anywhere else, not just if
they are not connected.
2012-02-09 [r962] Andrew M. Bishop <amb>
* src/types.h: The latlong_t type is signed so must use an
appropriate constant.
2012-02-08 [r961] Andrew M. Bishop <amb>
* src/nodesx.h, src/types.h, src/prunex.c: Change the way that
pruned nodes are recorded.
2012-02-08 [r960] Andrew M. Bishop <amb>
* src/prunex.c: Don't mark pruned nodes as they are found but mark
them all at the end.
2012-02-07 [r959] Andrew M. Bishop <amb>
* src/Makefile: Revert the CFLAGS value.
2012-01-28 [r958] Andrew M. Bishop <amb>
* src/typesx.h: Fix the recent change with the bitmask type.
2012-01-28 [r956-957] Andrew M. Bishop <amb>
* src/files.h, src/prunex.c: Fix function comments.
* src/sorting.h: Replace a missing header.
2012-01-28 [r955] Andrew M. Bishop <amb>
* src/segments.c, src/prunex.h, src/superx.c, src/visualiser.c,
src/relationsx.c, src/profiles.h, src/sorting.h, src/fakes.h,
src/nodesx.c, src/output.c, src/relations.c, src/typesx.h,
src/results.c, src/relations.h, src/nodes.c, src/waysx.c,
src/optimiser.c, src/osmparser.c, src/segmentsx.c, src/nodes.h,
src/tagging.c, src/prunex.c, src/segmentsx.h, src/profiles.c,
src/queue.c: Simplify and standardise the included headers.
2012-01-14 [r954] Andrew M. Bishop <amb>
* src/typesx.h: Change the bitmask type from uint8_t to uint32_t.
2012-01-14 [r953] Andrew M. Bishop <amb>
* src/prunex.h, doc/html/usage.html, src/planetsplitter.c,
doc/USAGE.txt, src/prunex.c: Add the option to prune small
isolated regions out of the database to avoid routes starting of
finishing on them.
2012-01-14 [r951-952] Andrew M. Bishop <amb>
* src/segmentsx.c: Bug fix for latest change.
* src/relationsx.c: Zero the structure before filling it in so that
no junk is written to disk.
2012-01-13 [r950] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/segmentsx.c, src/typesx.h,
src/segmentsx.h: Add new macros to abstract the bit mask types.
2012-01-13 [r949] Andrew M. Bishop <amb>
* src/nodesx.h, src/prunex.h (added), src/superx.c,
src/relationsx.c, src/types.h, src/planetsplitter.c,
src/Makefile, src/segmentsx.c, src/nodesx.c, src/prunex.c
(added), src/segmentsx.h: Add an infrastructure to allow adding
new functions to prune nodes and segments.
2012-01-11 [r948] Andrew M. Bishop <amb>
* src/sorting.c, src/relationsx.c, src/sorting.h, src/waysx.c,
src/nodesx.c: The filesort_*() functions now return a count of
the number of items kept after sorting.
2012-01-10 [r947] Andrew M. Bishop <amb>
* src/superx.c, src/nodesx.c: Move the allocation of the nodexs
super flags memory until just before it is needed and free it as
soon as no longer needed.
2011-12-11 [r946] Andrew M. Bishop <amb>
* src/segmentsx.c: Remove unnecessary test.
2011-12-11 [r945] Andrew M. Bishop <amb>
* src/output.c: Remove warning about uninitialised variable.
2011-12-11 [r944] Andrew M. Bishop <amb>
* src/relationsx.c, src/segmentsx.c, src/nodesx.c: Fill the
structures with zero before inserting data and writing to file
(removes junk from unused spaces in database files).
2011-12-11 [r943] Andrew M. Bishop <amb>
* src/superx.c, src/relationsx.c, src/segmentsx.c, src/segmentsx.h:
Remove the "position" parameter from the NextSegmentX() function.
2011-12-11 [r942] Andrew M. Bishop <amb>
* src/nodesx.h, src/relationsx.c, src/segmentsx.c, src/waysx.h,
src/segmentsx.h: Remove the "position" parameter from the
PutBack*X() functions (only used in slim mode).
2011-12-10 [r940-941] Andrew M. Bishop <amb>
* src/osmparser.h: Update file now that the name has changed.
* src/functionsx.h (removed), src/planetsplitter.c,
src/osmparser.c, src/osmparser.h (added): Rename functionsx.h to
osmparser.h.
2011-12-09 [r939] Andrew M. Bishop <amb>
* web/www/routino/customvisualiser.cgi,
web/www/routino/customrouter.cgi: The custom router uses the
translated router.html or visualiser.html depending on the
browser's Accept-Language header.
2011-12-08 [r936-938] Andrew M. Bishop <amb>
* web/www/routino/visualiser.html (added): Create a link from
visualiser.html.en to visualiser.html.
* web/www/routino/visualiser.html (removed),
web/www/routino/visualiser.html.en (added): Rename
visualiser.html to visualiser.html.en.
* web/www/routino/visualiser.js, web/www/routino/visualiser.html,
web/www/routino/router.js: Move semi-constant strings from the
JavaScript to the HTML so that they can be translated.
2011-12-08 [r935] Andrew M. Bishop <amb>
* web/www/routino/router.html.en, web/www/routino/router.html.nl,
web/www/routino/router.js: Use the translated total distance from
the summary and not the untranslated one from the CGI.
2011-12-08 [r934] Andrew M. Bishop <amb>
* src/visualiser.c: Make limit checking work with one-way streets
and in slim mode.
2011-12-07 [r933] Andrew M. Bishop <amb>
* doc/html/installation.html, web/www/routino/visualiser.js,
web/www/routino/router.html.en, doc/INSTALL.txt,
web/www/routino/visualiser.html, web/www/routino/router.html.nl,
web/www/routino/router.js, web/www/routino/mapprops.js (added):
Move the map preferences (N/S/E/W range, zoom range and URLs) to
a separate file.
2011-12-07 [r932] Andrew M. Bishop <amb>
* web/www/routino/page-elements.css,
web/www/routino/router.html.en, web/www/routino/visualiser.html,
web/www/routino/router.html.nl: Replace the "show"/"hide" button
with "+"/"-" buttons.
2011-12-07 [r931] Andrew M. Bishop <amb>
* web/data/create.sh: Generate an error log.
2011-12-06 [r930] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Describe what the
roundabout and mini-roundabout tags are used for.
2011-12-06 [r929] Andrew M. Bishop <amb>
* src/output.c: Mini-roundabouts are now described as roundabouts
instead of junctions.
2011-12-06 [r927-928] Andrew M. Bishop <amb>
* 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,
src/test/expected/turns-WP07.txt,
src/test/expected/turns-WP08.txt: Updated test case expected
results with the roundabout changes.
* src/output.c: Use constants for the values of the "important"
variable. Fix the missing junctions on roundabouts.
2011-12-06 [r925-926] Andrew M. Bishop <amb>
* src/output.c: Output HTML directions for roundabouts.
* xml/routino-translations.xml, src/translations.h,
src/translations.c, xml/routino-translations.xsd: Add new
translate-able strings for roundabouts.
2011-12-06 [r924] Andrew M. Bishop <amb>
* src/ways.h: Cache three ways not two.
2011-11-26 [r923] Andrew M. Bishop <amb>
* src/types.h, doc/TAGGING.txt, src/osmparser.c, src/filedumper.c,
doc/html/tagging.html, src/types.c, xml/routino-tagging.xml:
Parse and store information about roundabouts (to improve routing
instructions).
2011-11-26 [r921-922] Andrew M. Bishop <amb>
* doc/OUTPUT.txt, src/output.c, doc/html/output.html: Refactor a
lot of the code, simplify it and fix some bugs: Names of highways
in HTML format. Names of highways and bearings for GPX routes.
Change the format of the text file to be more like GPX & HTML.
* src/ways.h, src/ways.c: Allow space to cache one name for each
cached way (in slim mode).
2011-11-23 [r920] Andrew M. Bishop <amb>
* xml/routino-tagging-nomodify.xml: Fix the invalid XML.
2011-11-22 [r919] Andrew M. Bishop <amb>
* src/osmparser.c, xml/routino-osm.xsd: Check that XML file
contains version='0.6' in 'osm' tag.
2011-11-22 [r918] Andrew M. Bishop <amb>
* src/filedumper.c: Refactor the code by moving the dumping of an
OSM region into a separate function.
2011-11-22 [r917] Andrew M. Bishop <amb>
* src/filedumper.c: Include a bounding box in the --dump-osm XML
output.
2011-11-21 [r916] Andrew M. Bishop <amb>
* src/filedumper.c: Ensure that only segments completely within the
specified region are dumped when using --dump-osm.
2011-11-21 [r914-915] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html: Document the use of the
area tag.
* src/osmparser.c, src/segmentsx.c, xml/routino-tagging.xml: When
an area and a way overlap keep the way and discard the area.
2011-11-20 [r913] Andrew M. Bishop <amb>
* src/test/Makefile, src/xml/Makefile: Fix some more Makefile
oddities.
2011-11-20 [r912] Andrew M. Bishop <amb>
* web/www/openlayers/install.sh: Change script to default to
downloading OpenLayers v2.11.
2011-11-19 [r910-911] Andrew M. Bishop <amb>
* Makefile: Fix some Makefile oddities.
* src/test/Makefile, src/Makefile, src/xml/Makefile: Fix some
Makefile oddities.
2011-11-19 [r907-909] Andrew M. Bishop <amb>
* doc/html/tagging.html: Fix heading anchor names.
* src/xml/test/bad-comment-extra-double-dash.xml (added),
src/xmlparse.l: Fixed bug in XMl parsing that allowed invalid XML
(double dash within comments).
* src/queue.c: Revert back to r874 (itself the same as r867) but
with the change that should have happened in r883 rather than
being based on r868.
2011-11-12 Andrew M. Bishop <amb>
Version 2.1.2 released
2011-11-12 [r903] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html:
Updated for version 2.1.2.
2011-11-12 [r902] Andrew M. Bishop <amb>
* xml/routino-translations.xml, web/www/routino/router.html.en,
web/www/routino/router.html.nl: Added Russian language
translations.
2011-11-12 [r901] Andrew M. Bishop <amb>
* doc/OUTPUT.txt, doc/TAGGING.txt, doc/ALGORITHM.txt,
doc/INSTALL.txt: Small formatting changes.
2011-11-11 [r900] Andrew M. Bishop <amb>
* doc/OUTPUT.txt, src/output.c, doc/html/output.html: Change the
names of the variables for the XML and raw versions of the
highway names. Output the text files with translated highway
names. Update the documentation to say that only the header is
untranslated in the text files.
2011-11-11 [r899] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Fix invalid XML file.
2011-11-11 [r898] Andrew M. Bishop <amb>
* doc/TAGGING.txt, doc/html/tagging.html, xml/routino-tagging.xml:
Improve the documentation for the tagging rule configuration
file.
2011-11-11 [r896-897] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Add some more tagging rules from the UK
error.log file.
* web/bin/summarise-log.pl: Summarise segments that are loops.
2011-11-11 [r895] Andrew M. Bishop <amb>
* src/relationsx.c: Make the progress messages more consistent.
2011-11-10 [r894] Andrew M. Bishop <amb>
* web/www/routino/router.pl: Use the same convention to indicate
the user-editable part of the file as used elsewhere.
2011-11-10 [r893] Andrew M. Bishop <amb>
* src/translations.h, doc/OUTPUT.txt, src/output.c,
src/translations.c, doc/html/output.html: Change the names of the
variables for the XML and raw versions of the translations.
Output the text files with the raw versions and not the XML
versions of the copyright information. Update the documentation
to say that only the copyright information is translated in the
text files.
2011-11-10 [r892] Andrew M. Bishop <amb>
* src/translations.c: Don't convert the highway types to XML
numeric entities here (it is already done in the output
functions).
2011-11-09 [r891] Andrew M. Bishop <amb>
* src/optimiser.c: Change the condition used to terminate the
search for the best route.
2011-11-08 [r890] Andrew M. Bishop <amb>
* src/superx.c: Improve comment.
2011-11-08 [r889] Andrew M. Bishop <amb>
* xml/Makefile: Delete the auto-generated profile.js and profile.pl
files with distclean target.
2011-10-31 [r888] Andrew M. Bishop <amb>
* src/files.h: Add a #define to disable the use of pread()/pwrite()
but this must be manually configured, there is no configure
script.
2011-10-31 [r887] Andrew M. Bishop <amb>
* src/nodesx.h, src/relations.h, src/files.h, src/relationsx.c,
src/ways.h, src/segments.h, src/waysx.c, src/Makefile,
src/xml/Makefile, src/nodes.h, src/waysx.h, src/segmentsx.h: Use
pread() and pwrite() functions instead of seek() followed by
read() or write().
2011-10-30 [r886] Andrew M. Bishop <amb>
* src/nodes.c, src/nodes.h: Copy the node offsets into RAM for the
slim mode since looking them up in the file is the largest single
contributor to the time.
2011-10-29 [r885] Andrew M. Bishop <amb>
* src/segments.c, src/visualiser.c, src/nodes.c, src/optimiser.c,
src/filedumper.c, src/nodes.h, src/output.c: Rationalise and
reduce the usage of LookUpNode() function.
2011-10-24 [r884] Andrew M. Bishop <amb>
* src/Makefile, src/xml/Makefile: Fix long-standing annoying bug
with dependencies for slim versions.
2011-10-24 [r883] Andrew M. Bishop <amb>
* src/queue.c: No need to use uint32_t (just use int).
2011-10-23 Andrew M. Bishop <amb>
Version 2.1.1 released
2011-10-23 [r881-882] Andrew M. Bishop <amb>
* doc/NEWS.txt, FILES, doc/html/readme.html: Update for version
2.1.1.
* doc/html/configuration.html: Update copyright year.
2011-10-22 [r880] Andrew M. Bishop <amb>
* Makefile: Fix running 'make test' from the top level.
2011-10-22 [r879] Andrew M. Bishop <amb>
* src/filedumper.c: Add some more typecasts before printing the
values.
2011-10-22 [r878] Andrew M. Bishop <amb>
* xml/Makefile: Fix the installation of the XML files.
2011-10-22 [r876-877] Andrew M. Bishop <amb>
* src/test/expected/turns-WP09.txt, src/test/turns.osm,
src/test/expected/turns-WP10.txt,
src/test/expected/turns-WP11.txt,
src/test/expected/turns-WP12.txt,
src/test/expected/turns-WP04.txt,
src/test/expected/turns-WP13.txt,
src/test/expected/turns-WP05.txt,
src/test/expected/turns-WP14.txt,
src/test/expected/turns-WP06.txt,
src/test/expected/turns-WP15.txt,
src/test/expected/turns-WP16.txt (added),
src/test/expected/turns-WP07.txt,
src/test/expected/turns-WP08.txt: Test case for 'except' tags on
turn restrictions.
* src/osmparser.c, xml/routino-tagging.xml: Fix handling of
'except' tags for turn restrictions.
2011-10-22 [r875] Andrew M. Bishop <amb>
* src/sorting.c: Revert back to something very close to r869
because it is fastest by a tiny fraction.
2011-10-22 [r874] Andrew M. Bishop <amb>
* src/results.h, src/queue.c: Revert back to r867 because it is
faster (although only by 1%) than any of the other combinations.
2011-10-22 [r873] Andrew M. Bishop <amb>
* src/sorting.c, src/queue.c: Revert back to r864 zero-based binary
heap but with r868/r869 refactored code.
2011-10-15 [r872] Andrew M. Bishop <amb>
* src/sorting.c, src/queue.c: Change the binary heap to a 3-ary
heap.
2011-10-15 [r871] Andrew M. Bishop <amb>
* src/sorting.c: Bug fixes for the previous change.
2011-10-15 [r870] Andrew M. Bishop <amb>
* src/sorting.c, src/results.h, src/queue.c: Change the binary heap
to a 4-ary heap.
2011-10-15 [r868-869] Andrew M. Bishop <amb>
* src/sorting.c: Refactor the binary heap to reduce the number of
comparisons.
* src/queue.c: Refactor the binary heap to reduce the number of
comparisons.
2011-10-09 [r867] Andrew M. Bishop <amb>
* src/sorting.c: Change to a unity based binary heap rather than
zero based one to save some additions.
2011-10-09 [r866] Andrew M. Bishop <amb>
* src/queue.c: Bug fix with previous change.
2011-10-06 [r865] Andrew M. Bishop <amb>
* src/results.h, src/queue.c: Change to a unity based binary heap
rather than zero based one to save some additions.
2011-10-06 [r864] Andrew M. Bishop <amb>
* src/results.c: Swap the order of two parts of an && statement.
2011-10-06 [r863] Andrew M. Bishop <amb>
* src/results.h, src/results.c: Change bin counters to 8-bit
(reduces memory) and pre-allocate first dimension of pointer
array (saves time).
2011-10-06 [r862] Andrew M. Bishop <amb>
* Makefile, xml/Makefile, doc/Makefile, src/Makefile,
src/xml/Makefile: Makefiles are more consistent with each other
and 'make test' can be run from the top level.
2011-10-06 [r861] Andrew M. Bishop <amb>
* doc/html/usage.html, src/planetsplitter.c, doc/USAGE.txt: Change
the default number of iterations to 5 since testing shows that
there is negligible improvement beyond here.
2011-10-05 [r860] Andrew M. Bishop <amb>
* src/optimiser.c: Optimise the number of hash function bins by
trial and error.
2011-10-05 [r859] Andrew M. Bishop <amb>
* src/Makefile, src/xml/Makefile: Add the gcc options for profiling
(coverage) and delete the files generated by it.
2011-10-05 [r858] Andrew M. Bishop <amb>
* src/results.c: If there are too many results in one bin then
double the number of bins.
2011-10-05 [r857] Andrew M. Bishop <amb>
* src/results.h, src/results.c: Remove the two RESULTS_*_INCREMENT
constants by swapping the dimensions on the 'point' array so that
both have unity value and are pointless.
2011-10-05 [r856] Andrew M. Bishop <amb>
* src/superx.c: Optimise the number of hash function bins by trial
and error.
2011-10-04 [r854-855] Andrew M. Bishop <amb>
* src/superx.c, src/optimiser.c: Increase the size of the hash
array used to store the results.
* src/results.h, src/results.c: Change the way that allocated
memory is tracked.
2011-10-04 [r853] Andrew M. Bishop <amb>
* src/results.c: Split the data increment constant into two for the
different parts of the data structure.
2011-10-03 [r852] Andrew M. Bishop <amb>
* web/www/routino/router.cgi: Ensure that the shortest or quickest
option is passed to the router.
2011-10-03 Andrew M. Bishop <amb>
Version 2.1 released
2011-10-03 [r851] Andrew M. Bishop <amb>
* FILES: Remove another .svn directory.
2011-10-03 [r850] Andrew M. Bishop <amb>
* doc/NEWS.txt, FILES, doc/html/readme.html: Update for version
2.1.
2011-09-07 [r849] Andrew M. Bishop <amb>
* src/test/super-or-not.osm, src/optimiser.c,
src/test/expected/super-or-not-WP03.txt (added): Handle the
special case where the start point is a super-node and the finish
point is somewhere within one of the super-segments from that
node.
2011-09-07 [r848] Andrew M. Bishop <amb>
* src/nodes.c: Fix for previous binary search change.
2011-09-07 [r847] Andrew M. Bishop <amb>
* src/filedumper.c: Fix bug with earlier change to OSM file
creator.
2011-09-07 [r846] Andrew M. Bishop <amb>
* src/router.c: Fix confusing, duplicated, output message.
2011-09-07 [r845] Andrew M. Bishop <amb>
* src/nodes.c: Make stricter checks for closest nodes just like in
v2.0.3 for segments.
2011-09-07 [r844] Andrew M. Bishop <amb>
* src/filedumper.c: Fix formatting problem with dumped OSM file.
2011-09-07 [r842-843] Andrew M. Bishop <amb>
* src/nodes.c, src/waysx.c, src/nodesx.c, src/relations.c: Check
binary search functions and improve comments, fix pathological
case with end point and/or improve start point.
* src/filedumper.c: Use macro test function rather than direct
check.
2011-09-06 [r841] Andrew M. Bishop <amb>
* src/test/super-or-not.osm (added), src/test/a-b.sh (added),
src/test/expected/super-or-not-WP01.txt (added),
src/test/expected/super-or-not-WP02.txt (added), src/test,
src/test/super-or-not.sh (added): Added a new test case for the
routing bug-fix in version 2.0.3 (route via super-nodes may not
be shortest).
2011-09-06 [r840] Andrew M. Bishop <amb>
* src/test/expected/dead-ends-WP01.txt,
src/test/expected/dead-ends-WP02.txt,
src/test/expected/dead-ends-WP03.txt,
src/test/expected/dead-ends-WP04.txt,
src/test/expected/dead-ends-WP05.txt,
src/test/expected/dead-ends-WP06.txt,
src/test/expected/dead-ends-WP07.txt,
src/test/expected/dead-ends-WP08.txt,
src/test/expected/dead-ends-WP09.txt,
src/test/expected/loops-WP10.txt,
src/test/expected/loops-WP11.txt, src/test/copyright.xml (added),
src/test/expected/no-super-WP01.txt,
src/test/expected/no-super-WP02.txt,
src/test/expected/no-super-WP03.txt,
src/test/expected/no-super-WP04.txt,
src/test/expected/turns-WP01.txt,
src/test/expected/turns-WP02.txt,
src/test/expected/turns-WP03.txt, src/test/start-1-finish.sh,
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/a-b-c.sh,
src/test/expected/dead-ends-WP10.txt,
src/test/expected/dead-ends-WP11.txt,
src/test/expected/loops-WP01.txt,
src/test/expected/loops-WP02.txt,
src/test/expected/loops-WP03.txt,
src/test/expected/loops-WP04.txt,
src/test/expected/loops-WP05.txt,
src/test/expected/loops-WP06.txt,
src/test/expected/loops-WP07.txt,
src/test/expected/loops-WP08.txt,
src/test/expected/loops-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: Ensure that test cases have
correct copyright notice (Routino, AGPL3) in generated data and
not the default one (OSM, CC-SA).
2011-09-06 [r838-839] Andrew M. Bishop <amb>
* src/test/expected/dead-ends-WP01.txt (added),
src/test/expected/dead-ends-WP02.txt (added),
src/test/expected/dead-ends-WP03.txt (added),
src/test/expected/dead-ends-WP04.txt (added),
src/test/expected/dead-ends-WP05.txt (added),
src/test/expected/dead-ends-WP06.txt (added),
src/test/expected/dead-ends-WP07.txt (added),
src/test/expected/dead-ends-WP08.txt (added),
src/test/expected/loops-WP10.txt (added),
src/test/expected/dead-ends-WP09.txt (added),
src/test/expected/loops-WP11.txt (added),
src/test/expected/no-super-WP01.txt (added),
src/test/expected/no-super-WP02.txt (added),
src/test/expected/no-super-WP03.txt (added),
src/test/expected/turns-WP01.txt (added),
src/test/expected/no-super-WP04.txt (added),
src/test/expected/turns-WP02.txt (added),
src/test/expected/turns-WP03.txt (added),
src/test/expected/turns-WP04.txt (added),
src/test/expected/turns-WP05.txt (added),
src/test/expected/turns-WP06.txt (added),
src/test/expected/turns-WP07.txt (added),
src/test/expected/turns-WP08.txt (added),
src/test/expected/turns-WP09.txt (added),
src/test/expected/dead-ends-WP10.txt (added),
src/test/expected/dead-ends-WP11.txt (added),
src/test/expected/loops-WP01.txt (added),
src/test/expected/loops-WP02.txt (added),
src/test/expected/loops-WP03.txt (added),
src/test/expected/loops-WP04.txt (added),
src/test/expected/loops-WP05.txt (added),
src/test/expected/loops-WP06.txt (added),
src/test/expected/loops-WP07.txt (added),
src/test/expected/loops-WP08.txt (added),
src/test/expected/loops-WP09.txt (added),
src/test/expected/turns-WP10.txt (added),
src/test/expected/turns-WP11.txt (added),
src/test/expected/turns-WP12.txt (added),
src/test/expected/turns-WP13.txt (added),
src/test/expected/turns-WP14.txt (added),
src/test/expected/turns-WP15.txt (added): Store the expected
results to check for future regressions.
* src/test/a-b-c.sh, src/test/expected (added),
src/test/start-1-finish.sh: Store the expected results to check
for future regressions.
2011-09-05 [r837] Andrew M. Bishop <amb>
* src/relationsx.c: Ignore relations based on all vehicle types
(including bicycles) not just motor vehicles.
2011-09-05 [r836] Andrew M. Bishop <amb>
* xml/Makefile, xml/scripts/walk.pl (added), xml,
xml/scripts/ride.pl (added), web/data, xml/scripts (added),
xml/scripts/drive.pl (added): Generate special-use sets of
tagging rules for walking, riding and driving
2011-08-27 [r834-835] Andrew M. Bishop <amb>
* web/bin/summarise-log.pl (added): A script to process the error
log file and summarise it.
* xml/routino-tagging.xml: Add lots more tagging rules based on
errors logged from parsing UK, add some more error logging.
2011-08-27 [r832-833] Andrew M. Bishop <amb>
* src/osmparser.c: Only log errors for highways.
* src/relationsx.c: Improve the error messages for bad relations.
2011-08-27 [r830-831] Andrew M. Bishop <amb>
* src/filedumper.c: Change the 'generator' tag in the dumped XML
file.
* xml/routino-tagging.xsd: Whitespace change.
2011-08-21 [r828] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, src/nodes.c, FILES,
src/optimiser.c, src/router.c, doc/html/readme.html: Merge
version 2.0.3 into working version.
2011-08-14 [r827] Andrew M. Bishop <amb>
* src/tagging.h, src/tagging.c, xml/routino-tagging.xsd: Add an
unset rule in the tagging processing XML file.
2011-08-13 [r826] Andrew M. Bishop <amb>
* src/tagging.h, src/tagmodifier.c, src/osmparser.c, src/tagging.c,
xml/routino-tagging.xsd: Add a logerror rule in the tagging
processing XML file.
2011-08-04 [r825] Andrew M. Bishop <amb>
* src/osmparser.c: Add more acceptable number suffixes.
2011-07-23 [r813] Andrew M. Bishop <amb>
* src/osmparser.c: Better parsing of width/height/length and weight
and more information about value actually used.
2011-07-21 [r812] Andrew M. Bishop <amb>
* src/relationsx.c, src/osmparser.c, src/waysx.c, src/segmentsx.c,
src/nodesx.c: Add logging of parsing and processing errors.
2011-07-21 [r810-811] Andrew M. Bishop <amb>
* src/test/a-b-c.sh, src/test/start-1-finish.sh,
src/test/only-split.sh: Use the --errorlog option.
* doc/html/usage.html, src/planetsplitter.c, doc/USAGE.txt: The
filename is now optional in the --errorlog option.
2011-07-21 [r809] Andrew M. Bishop <amb>
* src/planetsplitter.c: Only open/close the error log file if one
was requested.
2011-07-10 [r806-808] Andrew M. Bishop <amb>
* src/test: Ignore the auto-generated files from the new test case.
* src/test/invalid-turn-relations.osm (added),
src/test/invalid-turn-relations.sh (added),
src/test/only-split.sh (added): Add test cases for the new turn
relation validity checks.
* src/relationsx.c: Check turn relations more carefully and discard
them if they are invalid.
2011-07-04 [r805] Andrew M. Bishop <amb>
* src/relationsx.c: Change the termination of route relation
way/relation lists.
2011-07-03 [r804] Andrew M. Bishop <amb>
* src/logging.c, doc/html/usage.html, src/planetsplitter.c,
src/logging.h, doc/USAGE.txt: Add framework for logging error
during OSM parsing and subsequent processing.
2011-07-02 [r803] Andrew M. Bishop <amb>
* src/nodes.h: Replace over-sized file entry with one of
appropriate size.
2011-08-04 Andrew M. Bishop <amb>
Version 2.0.3 released
2011-08-04 [r823] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES, doc/html/readme.html:
Updated for version 2.0.3.
2011-08-04 [r822] Andrew M. Bishop <amb>
* src/router.c: If there is a route that passes super-nodes and one
that doesn't then choose the better one.
2011-08-04 [r820-821] Andrew M. Bishop <amb>
* src/router.c: If there is a direct route without passing any
super-nodes then keep it as a backup in case the potential route
that does pass super-nodes doesn't work out.
* src/optimiser.c: Allow calling FixForwardRoute() more than once.
2011-08-04 [r819] Andrew M. Bishop <amb>
* src/optimiser.c: Revert previous change because it breaks the
dead-end handling.
2011-08-03 [r818] Andrew M. Bishop <amb>
* src/router.c: Find a valid route if the start and end point are
the same location (it doesn't require a U-turn).
2011-08-03 [r817] Andrew M. Bishop <amb>
* src/optimiser.c, src/router.c: Add a new (less confusing) error
message for when the start of the route has no super-nodes and
doesn't include the end node and make clearer the error message
when the combining of routes fails.
2011-08-03 [r816] Andrew M. Bishop <amb>
* src/nodes.c: Make more checks on the closest segment to avoid
choosing one that our profile does not allow us to use.
2011-08-02 [r815] Andrew M. Bishop <amb>
* src/optimiser.c: Handle the case where the start node is a
super-node and there is no previous segment.
2011-06-26 Andrew M. Bishop <amb>
Version 2.0.2 released
2011-06-26 [r800-r801] Andrew M. Bishop <amb>
* doc/README.txt, doc/html/readme.html: Update for version 2.0.2.
* doc/NEWS.txt, FILES, doc/html/readme.html: Update for version
2.0.2.
2011-06-25 [r798-799] Andrew M. Bishop <amb>
* src/results.c: Fix comment associated with results list memory
handling.
* src/optimiser.c: Free temporary results that are calculated.
2011-06-25 [r795-797] Andrew M. Bishop <amb>
* src/tagging.h, src/planetsplitter.c, src/tagging.c: Add some
functions to free the tagging rules when they have been used.
* src/osmparser.c: Free some memory allocated when parsing the
file.
* src/nodesx.c: Free some memory allocated when writing the file.
2011-06-19 [r794] Andrew M. Bishop <amb>
* src/tagmodifier.c: Change to unsigned long and ensure that printf
format specifiers are correct.
2011-06-19 [r792-793] Andrew M. Bishop <amb>
* src/segmentsx.c: If a node has no segments return a NULL pointer
rather than random junk.
* xml/routino-tagging.xml: Reinstate the line that makes
roundabouts one-way.
2011-06-18 [r791] Andrew M. Bishop <amb>
* src/osmparser.c, src/xmlparse.h, src/xmlparse.l: Don't use the
flex yylineno but keep track with an unsigned long long line
counter instead (if there are more than 2^31 nodes then there are
more than 2^31 lines as well).
2011-06-18 [r790] Andrew M. Bishop <amb>
* src/superx.c, src/relationsx.c, src/types.h, src/osmparser.c,
src/waysx.c, src/filedumper.c, src/segmentsx.c, src/nodesx.c,
src/router.c, src/typesx.h: Ensure that when printing numbers of
the index_t type that an appropriate printf format specifier is
used (ready for if it is redefined as 64-bit).
2011-06-18 [r788-789] Andrew M. Bishop <amb>
* src/Makefile: Use the -std=c99 option by default.
* src/relationsx.c, src/waysx.c, src/segmentsx.c, src/nodesx.c,
src/segmentsx.h: Fix some more warnings from -Wextra and/or
-pedantic options.
2011-06-18 [r787] Andrew M. Bishop <amb>
* src/xmlparse.l: Use flex %options instead of #defines, force
clean compilation with C99.
2011-06-18 [r786] Andrew M. Bishop <amb>
* src/relationsx.c, src/relationsx.h: Rename structure element
"restrict" to "restriction" to avoid C99 error (reserved word).
2011-06-18 [r785] Andrew M. Bishop <amb>
* src/superx.c: Removed warning from gcc-4.6.
2011-06-14 [r784] Andrew M. Bishop <amb>
* xml/routino-tagging.xml: Fix error with handling ferry routes
(patch from Michael Günnewig).
2011-06-07 Andrew M. Bishop <amb>
Version 2.0.1 released
2011-06-07 [r782] Andrew M. Bishop <amb>
* doc/html/readme.html: Update for version 2.0.1.
2011-06-07 [r781] Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt, FILES: Update for version 2.0.1.
2011-06-05 [r779-780] Andrew M. Bishop <amb>
* src/superx.c, src/visualiser.c, src/nodes.c, src/relationsx.c,
src/waysx.c, src/filedumper.c, src/segmentsx.c, src/nodesx.c,
src/relations.c: Replace int with appropriate defined types
(mostly index_t, ll_bin_t and ll_bin2_t).
* src/types.h: Add some comments to clarify the latitude/longitude
bin types and a new type for latitude/longitude bins (two
dimensions).
2011-06-05 [r777-778] Andrew M. Bishop <amb>
* src/profiles.c: Change unsigned int to int for consistency with
the rest of the code.
* src/optimiser.c: Remove unused variable (hangover from previous
U-turn searching).
2011-06-04 [r776] Andrew M. Bishop <amb>
* src/superx.c, src/osmparser.c: Add missing header file.
2011-06-04 [r773-775] Andrew M. Bishop <amb>
* src/osmparser.c: Convert integer and floating point values
inline. Check that node, way and relation IDs don't need to be
long long types.
* src/translations.c, src/profiles.c: Convert integer and floating
point values inline.
* src/xmlparse.h, src/xmlparse.l: The
XMLPARSE_ASSERT_(INTEGER|FLOATING) functions now don't return the
converted type.
2011-06-04 [r770-772] Andrew M. Bishop <amb>
* src/segments.h: Add a type cast to a macro.
* src/segmentsx.c, src/segmentsx.h: Change name of function
parameters to clarify what they are.
* src/relationsx.c, src/segmentsx.c: Fix some more potential
problems with a transition to 64-bit node_t.
2011-06-03 [r761] Andrew M. Bishop <amb>
* src/superx.c, src/relationsx.c, src/segmentsx.c: Shorten the
messages when running to avoid going beyond 80 characters.
2011-06-03 [r759-760] Andrew M. Bishop <amb>
* src/visualiser.c: Remove hard-coded numeric value and replace
with a #define value.
* src/superx.c, src/relationsx.c, src/segmentsx.c, src/typesx.h:
Remove hard-coded numeric values and replace with a common
#define value. Handle overflows consistently.
2011-06-03 [r758] Andrew M. Bishop <amb>
* src/nodesx.h, src/typesx.h: Move some macros from nodesx.h to
typesx.h.
2011-06-03 [r757] Andrew M. Bishop <amb>
* src/relationsx.c, src/tagmodifier.c, src/optimiser.c,
src/osmparser.c, src/waysx.c: Rationalise the increment of the
numbers used for the output when not --loggable.
2011-06-01 [r756] Andrew M. Bishop <amb>
* src/relationsx.c: Delete turn relations that refer to nodes or
ways that don't exist as soon as possible.
2011-05-31 [r755] Andrew M. Bishop <amb>
* src/nodesx.h, src/osmparser.c, src/segmentsx.c, src/waysx.h,
src/typesx.h: Fix some obvious problems with a transition to
64-bit node_t.
2011-05-31 [r754] Andrew M. Bishop <amb>
* src/tagging.c, src/translations.c, src/profiles.c: Fix
inconsistent C language version usage.
2011-05-30 Andrew M. Bishop <amb>
Version 2.0 released
2011-05-30 [r742] Andrew M. Bishop <amb>
* src/relationsx.c: Don't crash on malformed relations, give better
reporting of number when processing them.
2011-05-30 [r741] Andrew M. Bishop <amb>
* FILES: Update for release.
2011-05-30 [r740] Andrew M. Bishop <amb>
* src/segmentsx.c: Fix spelling mistake in function parameter
comment.
2011-05-30 [r738-739] Andrew M. Bishop <amb>
* src/test/Makefile: Make sure that clean really means it.
* doc/NEWS.txt, doc/README.txt, doc/html/readme.html: Update for
version 2.0 release.
2011-05-30 [r737] Andrew M. Bishop <amb>
* doc/html/usage.html, doc/html/algorithm.html, doc/TAGGING.txt,
doc/html/index.html, doc/html/data.html, doc/USAGE.txt,
doc/ALGORITHM.txt, doc/DATA.txt, doc/html/tagging.html: Run a
spelling check on the documentation.
2011-05-30 [r736] Andrew M. Bishop <amb>
* doc/html/algorithm.html: Describe new philosophy of alloing
U-turn at waypoints to avoid dead-ends.
2011-05-30 [r735] Andrew M. Bishop <amb>
* src/optimiser.c: Fix problem with test case loops WP11.
2011-05-30 [r734] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/router.c: Change the
philosophy on dead ends so that now a U-turn is made at the
waypoint if continuing in the previous direction would lead into
a dead-end. This simplifies the algorithm and removes a lot of
special case handling.
2011-05-30 [r731-733] Andrew M. Bishop <amb>
* src/test/loops.osm: Give the loops unique names.
* src/test/a-b-c.sh, src/test/start-1-finish.sh: Print less
information when running.
* src/fakes.c: Fix error with calculating length of fake segment
and optimise the ExtraFakeSegment function.
2011-05-29 [r730] Andrew M. Bishop <amb>
* src/test/a-b-c.sh: Exit on error.
2011-05-21 [r729] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/router.c: Find all routes
in the no-super.osm test case.
2011-05-20 [r727-728] Andrew M. Bishop <amb>
* src/test/no-super.osm: Add new test cases for fake
nodes/segments.
* src/fakes.c, src/optimiser.c, src/fakes.h: Add a special function
to handle the detection of U-turns between two fake segments that
sit on the same real segment.
2011-05-18 [r725-726] Andrew M. Bishop <amb>
* src/test/a-b-c.sh (added), src/test, src/test/no-super.sh
(added), src/test/no-super.osm (added): Add new test cases for
very simple routes with no super-nodes.
* src/fakes.c: Fix routing between two fake nodes on the same
segment (again).
2011-05-18 [r724] Andrew M. Bishop <amb>
* src/test/dead-ends.osm: Add a new waypoint at the very end of a
dead-end (not super-node).
2011-05-18 [r722-723] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h: Remove the override flag from
FindNormalRoute().
* src/optimiser.c, src/functions.h, src/router.c: Use the beginning
of the route as the start of the combined route (since it may
have special override segments in it).
2011-05-17 [r721] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/router.c: Change the order
of the arguments to the routing functions (move profile earlier).
2011-05-17 [r720] Andrew M. Bishop <amb>
* doc/Makefile: Install the license file in the doc directory.
2011-05-15 [r719] Andrew M. Bishop <amb>
* src/optimiser.c, src/router.c: Finally find a way out of
dead-ends, might have some nasty side-effects though.
2011-05-14 [r717-718] Andrew M. Bishop <amb>
* src/optimiser.c: Fix slim/non-slim variation.
* src/test/dead-ends.osm: Add another waypoint at the terminal
super-node.
2011-05-13 [r716] Andrew M. Bishop <amb>
* src/test/turns.osm: Force waypoint 13 to go round the roundabout
twice.
2011-05-12 [r714-715] Andrew M. Bishop <amb>
* src/test/turns.osm (added), src/test, src/test/turns.sh (added):
Added turn restriction test cases.
* src/test/start-1-finish.sh: Bug fix for logging.
2011-05-11 [r712-713] Andrew M. Bishop <amb>
* src/superx.c, src/segmentsx.c: Add comments to assert statements
that don't already have them.
* src/optimiser.c: Crash out if infinite loop (usually caused by a
bug elsewhere).
2011-05-08 [r708-711] Andrew M. Bishop <amb>
* src/test/start-1-finish.sh: Run filedumper, allow running under a
run-time debugger.
* src/optimiser.c: Remove clash of cache locations.
* src/test/Makefile: Print an extra message after comparing the
slim and non-slim results.
* src/segments.c, src/segments.h: Make the NextSegment function
inline (move from segments.c to segments.h).
2011-05-08 [r707] Andrew M. Bishop <amb>
* src/segments.c, src/visualiser.c, src/nodes.c, src/optimiser.c,
src/filedumper.c, src/nodes.h, src/output.c: The FirstSegment
function now takes a cache position argument.
2011-05-08 [r706] Andrew M. Bishop <amb>
* src/segments.c, src/nodes.c, src/relations.c, src/ways.c: Ensure
that the correct number of cached nodes, segments, ways or
relations are initialised.
2011-05-08 [r705] Andrew M. Bishop <amb>
* src/ways.h, src/filedumper.c, src/ways.c: Remove the unused name
caching for the ways (in slim mode).
2011-05-08 [r704] Andrew M. Bishop <amb>
* src/segments.h, src/segmentsx.h: Simplify the lookup of the
segment index in slim mode.
2011-05-07 [r703] Andrew M. Bishop <amb>
* src/optimiser.c: Allow the start of a route to double-back to the
initial node even if a super-node.
2011-05-07 [r700-702] Andrew M. Bishop <amb>
* src/test/loops.osm: Rename the waypoints.
* src/files.c: Remove useless assert statement.
* src/optimiser.c, src/nodes.h, src/segmentsx.c: Fix bugs found by
valgrind.
2011-05-07 [r697-699] Andrew M. Bishop <amb>
* src/optimiser.c: Handle things correctly if the
FindSuperSegment() function is called with a fake segment.
* src/test/Makefile: Ensure that executables are compiled before
running the tests.
* src/Makefile: Require slim and non-slim versions of fakes.o.
2011-05-07 [r695-696] Andrew M. Bishop <amb>
* src/router.c: Calculate an override version of the start of the
route to get out of dead-ends.
* src/output.c: Use real segments when making comparisons (not
pointers or non-real segments).
2011-05-06 [r690-694] Andrew M. Bishop <amb>
* src/test: Ignore files and directories generated by running 'make
test'.
* src/xml: Ignore files generated by running 'make test'.
* src/Makefile: Allow running 'make test' in the source directory.
* src/test/waypoints.pl (added), src/test/loops.osm (added),
src/test/Makefile (added), src/test/dead-ends.sh (added),
src/test/dead-ends.osm (added), src/test/start-1-finish.sh
(added), src/test/loops.sh (added): Routing test cases.
* src/test (added): A directory for routing test cases.
2011-05-06 [r689] Andrew M. Bishop <amb>
* src/xml/test/bad-attr-character-ref.xml (removed): Remove
false-positive test case (a bug in xmlparse.l previously flagged
this as an error).
2011-04-27 [r688] Andrew M. Bishop <amb>
* src/optimiser.c: Force going straight on if a waypoint is a
super-node.
2011-04-27 [r686-687] Andrew M. Bishop <amb>
* src/optimiser.c: Improve the FindSuperSegment() function when the
existing segment is the right answer.
* src/optimiser.c, src/router.c: Rename the variables in and around
the CombineRoutes() function for clarity.
2011-04-26 [r685] Andrew M. Bishop <amb>
* src/optimiser.c: When starting a super-route ensure that all
starting segments are super-segments to avoid u-turns at the
starting super-node.
2011-04-25 [r683-684] Andrew M. Bishop <amb>
* src/output.c: Fix error with turn description.
* src/output.c: Include a point number (hidden) in the HTML file.
2011-04-24 [r682] Andrew M. Bishop <amb>
* src/waysx.c, src/waysx.h: Fix error is last semi-automated
update.
2011-04-24 [r681] Andrew M. Bishop <amb>
* src/segments.c, src/superx.c, src/visualiser.c, src/relationsx.c,
src/segments.h, src/superx.h, src/filedumper.c, src/nodesx.c,
src/relations.c, src/nodesx.h, src/relations.h, src/nodes.c,
src/waysx.c, src/nodes.h, src/segmentsx.c, src/waysx.h,
src/segmentsx.h, src/ways.c: Make the comments more consistent.
2011-04-24 [r680] Andrew M. Bishop <amb>
* src/translations.h, src/fakes.c, src/filedumper.c, src/fakes.h,
src/nodesx.c, src/output.c, src/results.c, src/files.c,
src/nodesx.h, src/results.h, src/files.h, src/nodes.c,
src/planetsplitter.c, src/osmparser.c, src/nodes.h,
src/profiles.c, src/segments.c, src/sorting.c, src/tagging.h,
src/visualiser.c, src/superx.c, src/logging.c, src/ways.h,
src/profiles.h, src/relationsx.c, src/segments.h, src/sorting.h,
src/tagmodifier.c, src/visualiser.h, src/superx.h, src/logging.h,
src/relationsx.h, src/relations.c, src/functionsx.h,
src/relations.h, src/types.h, src/optimiser.c, src/waysx.c,
src/segmentsx.c, src/functions.h, src/waysx.h, src/router.c,
src/segmentsx.h: Update comments throughout the source code.
2011-04-23 [r679] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/ALGORITHM.txt: Add description of
U-turns at dead-ends.
2011-04-23 [r678] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/output.c, src/router.c:
Allow U-turns at dead-ends to avoid getting stuck.
2011-04-22 [r677] Andrew M. Bishop <amb>
* src/optimiser.c, src/router.c: Handle failure to find route
gracefully.
2011-04-22 [r676] Andrew M. Bishop <amb>
* web/www/routino/visualiser.cgi: Another change related to turn
restrictions (missed in last checkin).
2011-04-22 [r675] Andrew M. Bishop <amb>
* src/segments.c, doc/html/usage.html, web/www/routino/router.cgi,
src/segments.h, doc/USAGE.txt, src/router.c: Add in the option to
specify an initial heading.
2011-04-22 [r674] Andrew M. Bishop <amb>
* src/segmentsx.c, src/nodesx.c: Finish off the geographic sorting
of segments.
2011-04-22 [r673] Andrew M. Bishop <amb>
* src/filedumper.c: Use the common TurnAngle() function from
segments.c instead of a local one.
2011-04-22 [r672] Andrew M. Bishop <amb>
* src/segments.c, src/segments.h, src/output.c: Move the
turn_angle() and bearing_angle() functions from output.c into
segments.c.
2011-04-22 [r671] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/ALGORITHM.txt: Simplify the language
used describing the highway properties.
2011-03-21 [r670] Andrew M. Bishop <amb>
* src/relationsx.c: Ignore turn restrictions that ban going the
wrong way down a one-way road.
2011-03-21 [r668-669] Andrew M. Bishop <amb>
* src/segments.c, src/filedumper.c, src/profiles.c: Include math.h
for files that use math functions.
* src/types.h: Round the node latitude/longitude rather than
truncating.
2011-03-21 [r667] Andrew M. Bishop <amb>
* src/filedumper.c: Include some of the Routino internal
information when dumping an OSM format output.
2011-03-21 [r666] Andrew M. Bishop <amb>
* src/segmentsx.c: Fix bug with segment deduplication.
2011-03-21 [r665] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/relationsx.h,
src/nodesx.c: Sort the segments geographically.
2011-03-20 [r664] Andrew M. Bishop <amb>
* src/nodesx.c: Sort nodes strictly by latitude/longitude within
the bins (helps with regresssion testing).
2011-03-20 [r661-663] Andrew M. Bishop <amb>
* web/www/routino/documentation: Ignore extra image files.
* src/xmlparse.l: Ensure that UTF-8 is used internally when reading
in a numeric entity.
* src/router.c: Fix bug found by gcc-4.5.
2011-03-20 [r660] Andrew M. Bishop <amb>
* src/segmentsx.c: Return early from the IndexSegments function if
there are no segments.
2011-03-19 [r659] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/html/example0.png,
doc/html/example1.png, doc/ALGORITHM.txt, doc/html/example2.png,
doc/html/example3.png (added), doc/html/example4.png (added):
Update the algorithm documents for turn restrictions.
2011-03-19 [r658] Andrew M. Bishop <amb>
* src/segmentsx.c: Deduplicate in pairs only (i.e. if a segment
occurs 4 times then keep 2 of them).
2011-03-19 [r657] Andrew M. Bishop <amb>
* src/segmentsx.c: Cache the recently used ways when de-duplicating
segments.
2011-03-19 [r656] Andrew M. Bishop <amb>
* src/superx.c: Use previous segment in router rather than looking
at previous node.
2011-03-12 [r655] Andrew M. Bishop <amb>
* src/segmentsx.c, src/nodesx.c: Make the used nodes marker
bit-wide rather than byte-wide.
2011-03-12 [r654] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/nodesx.c: Make the nodes super
marker bit-wide rather than byte-wide.
2011-03-12 [r653] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/planetsplitter.c, src/superx.h,
src/nodesx.c: Make the nodes super marker a boolean.
2011-03-12 [r652] Andrew M. Bishop <amb>
* src/superx.c, src/planetsplitter.c, src/superx.h: Optimise the
search for supernodes, consider traffic when counting segments
that meet at a node.
2011-02-27 [r651] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/relationsx.c, src/waysx.c,
src/segmentsx.c, src/waysx.h, src/segmentsx.h: Rename the xdata
and xcached members of the nodesx, segmentsx and waysx
structures.
2011-02-27 [r650] Andrew M. Bishop <amb>
* src/nodesx.h, src/relationsx.c, src/planetsplitter.c,
src/waysx.c, src/relationsx.h, src/segmentsx.c, src/nodesx.c,
src/waysx.h, src/segmentsx.h: Don't have both xnumber and number
in the nodesx, segmentsx, waysx and relationsx structures.
2011-02-27 [r649] Andrew M. Bishop <amb>
* src/segmentsx.c, src/segmentsx.h: Remove a now unused array of
segment indexes.
2011-02-27 [r648] Andrew M. Bishop <amb>
* src/logging.c: Handle the case where the middle string is shorter
than the previous one.
2011-02-26 [r646-647] Andrew M. Bishop <amb>
* src/superx.c: Use the OtherNode and IsOneWay* macros when
routing.
* src/superx.c, src/relationsx.c, src/segmentsx.c, src/segmentsx.h:
Remove a pair of functions that are no longer used and rename the
other pair.
2011-02-26 [r645] Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/relationsx.h: Fixed
the turn relations with a few more functions.
2011-02-26 [r644] Andrew M. Bishop <amb>
* src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h: Renamed a
couple of functions for clarity.
2011-02-26 [r643] Andrew M. Bishop <amb>
* src/nodesx.h, src/superx.c, src/relationsx.c,
src/planetsplitter.c, src/osmparser.c, src/segmentsx.c,
src/nodesx.c, src/segmentsx.h: Go back to the internal structure
used (but reverted) during version 1.2 development where each
segment is stored only once. This halves the memory usage (mmap
files or just files) for planetsplitter. This is allowed because
a new algorithm to create the node to segment indexes makes it
simpler now that it was. This change is required so that
super-node/segment optimisation doesn't remove mutual loops. This
change doesn't handle turn restrictions yet.
2011-02-24 [r642] Andrew M. Bishop <amb>
* src/superx.c: Change a variable name to match the one used in
optimiser.c.
2011-02-24 [r641] Andrew M. Bishop <amb>
* src/superx.c, src/segmentsx.c: Create super-segments that go in
loops and preserve all such loops.
2011-02-23 [r640] Andrew M. Bishop <amb>
* src/segmentsx.c: Fix latent bug that can occur when
de-duplicating segments.
2011-02-23 [r639] Andrew M. Bishop <amb>
* xml/Makefile: Fix error in creating web files containing
profiles.
2011-02-20 [r638] Andrew M. Bishop <amb>
* src/optimiser.c: Allow U-turns at via points for transport types
that ignore turn restrictions.
2011-02-20 [r637] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/fakes.h: Don't allow
U-turns at via points (but doesn't necessarily include turning
round in the score when searching for optimum).
2011-02-18 [r636] Andrew M. Bishop <amb>
* src/optimiser.c: Fix the code that stops routes doubling-back on
themselves.
2011-02-11 [r635] Andrew M. Bishop <amb>
* web/www/routino/update-profiles.pl (added), xml/Makefile,
web/www/routino, web/www/routino/router.html.en,
web/www/routino/router.pl, web/www/routino/router.html.nl,
web/www/routino/router.js: Move the Javascript and Perl profiles
into separate files.
2011-02-11 [r634] Andrew M. Bishop <amb>
* doc/html/installation.html, web/www/openlayers/install.sh,
doc/INSTALL.txt: Change to OpenLayers 2.10.
2011-02-11 [r632-633] Andrew M. Bishop <amb>
* src/output.c: Don't confuse fake segments with junctions.
* src/optimiser.c: Fix problem with only one super-node in the
route.
2011-02-11 [r631] Andrew M. Bishop <amb>
* src/fakes.c: Fix bug with generating fake segments.
2011-02-11 [r629-630] Andrew M. Bishop <amb>
* xml/routino-profiles.xml: Wheelchairs do not obey turn
restrictions.
* web/www/routino/results.cgi, web/www/routino/router.html.en,
src/router.c, web/www/routino/router.pl,
web/www/routino/router.html.nl, web/www/routino/router.js: Print
a message if routed OK, allow web users to see router output (now
logged to file).
2011-02-05 [r628] Andrew M. Bishop <amb>
* src/filedumper.c: Fix statistics for ways (broken by change for
relations).
2011-02-05 [r626-627] Andrew M. Bishop <amb>
* src/superx.c, src/optimiser.c, src/segmentsx.c, src/nodesx.c:
Change some output printed while running.
* src/filedumper.c: Fix problem with dumping turn relations.
2011-02-05 [r625] Andrew M. Bishop <amb>
* src/filedumper.c: Print out the size of the relations.mem file.
2011-02-05 [r623-624] Andrew M. Bishop <amb>
* web/www/routino/visualiser.cgi: Updated the visualiser to include
turn restrictions.
* src/visualiser.c, doc/html/usage.html,
web/www/routino/visualiser.js, src/visualiser.h,
src/filedumper.c, doc/USAGE.txt, web/www/routino/visualiser.html:
Updated the visualiser to include turn restrictions.
2011-02-05 [r622] Andrew M. Bishop <amb>
* src/profiles.h, web/www/routino/noscript.cgi,
web/www/routino/customrouter.cgi, xml/routino-profiles.xsd,
web/www/routino/noscript.template.html, xml/routino-profiles.xml,
doc/html/usage.html, web/www/routino/router.cgi, src/optimiser.c,
web/www/routino/router.html.en, doc/USAGE.txt, src/router.c,
web/www/routino/router.pl, src/profiles.c,
web/www/routino/router.html.nl, web/www/routino/router.js:
Include the option to obey turn restrictions in the profile for
each transport type.
2011-01-30 [r620-621] Andrew M. Bishop <amb>
* doc/html/algorithm.html, doc/ALGORITHM.txt: Update algorithm
description to include turn restrictions and a note about how the
algorithm terminates the search.
* doc/TAGGING.txt, doc/USAGE.txt: Update text versions of documents
to match HTML.
2011-01-30 [r618-619] Andrew M. Bishop <amb>
* src/output.c: Correct comments.
* src/filedumper.c: Put a "restriction" tag into the turn
restrictions when dumped.
2011-01-30 [r617] Andrew M. Bishop <amb>
* src/optimiser.c, src/functions.h, src/router.c: Ensure that the
first/last node and first/last segment of the Results structure
are filled in properly.
2011-01-30 [r616] Andrew M. Bishop <amb>
* src/optimiser.c: Fix routing where the final node is a
super-node.
2011-01-29 [r615] Andrew M. Bishop <amb>
* src/relationsx.c: All nodes adjacent to a turn restriction must
also be turn restrictions.
2011-01-29 [r613-614] Andrew M. Bishop <amb>
* src/files.h: Fix assert problem.
* src/Makefile, src/xml/Makefile: Make dependency filename based on
object file name (fixes overwriting problem with slim versions).
2011-01-29 [r612] Andrew M. Bishop <amb>
* src/superx.c, src/files.h, src/relationsx.c, src/waysx.c,
src/segmentsx.c, src/nodesx.c, src/files.c: Ensure that record of
closed file descriptors are erased.
2011-01-29 [r610-611] Andrew M. Bishop <amb>
* src/optimiser.c: Don't check for turn relations in
FindStartRoutes().
* src/optimiser.c: Add some comments, shuffle a few lines of code.
2011-01-29 [r609] Andrew M. Bishop <amb>
* src/optimiser.c: Fix the code that allows overshooting by one
node when finding finish nodes.
2011-01-29 [r608] Andrew M. Bishop <amb>
* src/fakes.c, src/optimiser.c, src/Makefile, src/fakes.h,
src/relations.c, src/router.c: When finding a normal route check
for turn relations (considering previous segment). When finding
turn relations convert fake segments into real ones.
2011-01-29 [r607] Andrew M. Bishop <amb>
* src/nodes.c: Fix pathological case of rounding error for points
almost exactly on a segment.
2011-01-29 [r606] Andrew M. Bishop <amb>
* src/superx.c: Fix for route finding in planetsplitter.
2011-01-24 [r605] Andrew M. Bishop <amb>
* src/results.h, src/superx.c, src/optimiser.c, src/functions.h,
src/output.c, src/router.c, src/results.c: Finds routes and obeys
turn restrictions (only tested with very simple route and
restrictions, more turn restriction testing and regression
testing required).
2011-01-16 [r604] Andrew M. Bishop <amb>
* src/relations.h, src/relations.c: Fix logic error with searching
for via nodes.
2011-01-15 [r603] Andrew M. Bishop <amb>
* src/results.h, src/superx.c, src/optimiser.c, src/output.c,
src/results.c: Change the results structure to contain next
segment and rename elements to clarify prev/next node and
prev/next segment.
2011-01-15 [r602] Andrew M. Bishop <amb>
* src/segmentsx.c: Change to comment for clarification.
2011-01-15 [r599-601] Andrew M. Bishop <amb>
* doc/html/usage.html: Correction and clarification to filedumper
usage.
* src/nodesx.h: Change to comment for clarification.
* src/relations.h, src/relationsx.c, src/planetsplitter.c,
src/filedumper.c, src/relationsx.h, src/relations.c: Store the
'from' and 'to' segments and not nodes (to handle fake nodes
inserted in segments).
2011-01-15 [r598] Andrew M. Bishop <amb>
* src/visualiser.c, src/output.c: Change the IsSuperNode() macro to
take a single pointer argument.
2011-01-09 [r597] Andrew M. Bishop <amb>
* src/superx.c, src/relationsx.c, src/types.h: Make the 'from' and
'to' nodes of turn restrictions super-nodes.
2011-01-09 [r596] Andrew M. Bishop <amb>
* src/relations.h, src/optimiser.c, src/nodes.h, src/relations.c:
Check turn relations when finding a route.
2011-01-08 [r595] Andrew M. Bishop <amb>
* src/optimiser.c, src/filedumper.c, src/nodes.h: Change the
IsSuperNode() macro to take a single pointer argument.
2011-01-08 [r594] Andrew M. Bishop <amb>
* src/optimiser.c: Move the local variables closer to where they
are used.
2011-01-08 [r593] Andrew M. Bishop <amb>
* doc/html/tagging.html: Add information about the tags used for
turn relations.
2010-12-29 Andrew M. Bishop <amb>
Changed version control environment from RCS to CVS to SVN.
2010-12-29 Andrew M. Bishop <amb>
* doc/NEWS.txt: Temporary checkin to allow transition from RCS to
CVS to SVN.
* xml/routino-tagging.xml: Pass through turn relation information.
2010-12-21 Andrew M. Bishop <amb>
* src/filedumper.c: Add turn relations to the statistics and dump
outputs.
2010-12-21 Andrew M. Bishop <amb>
* src/ways.h, src/segments.h, src/nodes.h, src/ways.c: Optimise the
node, segment, way lookup in slim mode by checking if the
previous index is being requested again.
* src/relations.h, src/relations.c: Optimise the turn relation
lookup.
2010-12-21 Andrew M. Bishop <amb>
* src/relations.h, src/relations.c: Add functions to search for
turn relations that match a particular node.
2010-12-21 Andrew M. Bishop <amb>
* src/relations.h (added), src/relations.c (added): Initial
revision
* src/superx.c, src/relationsx.c, src/types.h: Update the nodes to
force a super-node where there is a turn restriction.
2010-12-21 Andrew M. Bishop <amb>
* src/relationsx.c, src/planetsplitter.c, src/relationsx.h: Finish
the processing of the turn relations now that the extra node
lookup table is in place.
2010-12-20 Andrew M. Bishop <amb>
* src/nodesx.c, src/segmentsx.c, src/segmentsx.h:
Handle the SegmentX Segment in the same way as the other data structures (map
into memory when used, open/close the file if slim). Create the real nodes
without mapping the segments into memory.
* src/nodesx.c, src/nodesx.h, src/relationsx.c, src/segmentsx.c, src/segmentsx.h,
src/waysx.h:
Make the PutBack*() functions be no-ops in slim mode and remove the
pre-processor guards from around the function calls.
* src/nodesx.c:
Don't map the file into memory for writing out the Nodes file.
* src/superx.c, src/waysx.c, src/waysx.h, src/nodesx.c, src/relationsx.c, src/segmentsx.c:
Close and open the files for the slim case to match the map/unmap of files for
the non-slim case.
* src/nodesx.c, src/segmentsx.c:
Make the last two changes work for slim mode.
* src/nodesx.c, src/nodesx.h:
Create the Nodes offset table at the end rather than during the sort process.
* src/nodesx.c, src/nodesx.h, src/segmentsx.c, src/segmentsx.h:
Don't maintain a copy of the whole set of Nodes along with the NodeXs but
generate the Node from the NodeX when written to disk. Create a lookup table
between the original index and the geographically sorted index.
2010-12-19 Andrew M. Bishop <amb>
* src/planetsplitter.c, src/relationsx.c:
Process the turn relations (apart from updating the indexes to the
geographically sorted nodes).
* src/superx.c: Handle the case of no super segments better.
* src/planetsplitter.c: Change around the order of the functions.
* src/relationsx.c:
A temporary check-in that handles turn restrictions more complicated than
actually allowed (ways must start/end at the via node).
* xml/routino-tagging.xml: Add mini-roundabouts.
* src/sorting.c: Bug fix for last change.
2010-12-18 Andrew M. Bishop <amb>
* src/segmentsx.c:
Remove the test for sorting zero segments (now that the sort function doesn't
crash).
* src/nodesx.c, src/segmentsx.c, src/segmentsx.h, src/superx.c:
Duplicate the IndexFirstSegmentX() and IndexNextSegmentX() functions to create
two distinct one for use at different times.
* src/sorting.c: Handle the case where there is no data in the file.
* src/Makefile, src/filedumper.c, src/functions.h, src/optimiser.c, src/planetsplitter.c,
src/relationsx.c, src/relationsx.h, src/router.c, src/types.h:
Add a Relations data type and write out the turn relations that have been read
in. Still doesn't perform the required processing after reading the data or use
the information for routing.
2010-12-12 Andrew M. Bishop <amb>
* src/osmparser.c, src/typesx.h:
Change the names of the enumerated types for turn restrictions.
2010-12-05 Andrew M. Bishop <amb>
* src/osmparser.c, src/relationsx.c, src/relationsx.h, src/typesx.h:
Parse turn restriction relations and store ones with a single via node.
(Doesn't do anything with them yet).
* src/nodesx.h, src/segmentsx.h, src/waysx.h:
Updated the comments for clarity.
2010-12-04 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodesx.c, src/nodesx.h, src/osmparser.c, src/types.h:
Improved version of previous change.
2010-11-28 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodesx.c, src/nodesx.h, src/osmparser.c, src/types.h:
Add parsing of mini-roundabouts.
* xml/routino-tagging.xml, src/filedumper.c, src/osmparser.c, src/types.c, src/types.h:
Remove the roundabout type from the parsing.
* src/fakes.c:
Fix some problems with fake nodes, in particular a route between two fake nodes
on the same segment can now be calculated.
* src/nodes.c:
Return the two nodes of a segment in the same order each time.
2010-11-27 Andrew M. Bishop <amb>
* src/fakes.h, src/sorting.h: New file.
* src/fakes.c, src/functions.h, src/nodesx.c, src/optimiser.c, src/output.c,
src/relationsx.c, src/router.c, src/segmentsx.c, src/sorting.c, src/types.h, src/waysx.c:
Split functions.h into fakes.h, sorting.h and the remainder in functions.h.
* src/optimiser.c, src/router.c:
Move some of the complexity from router.c to optimiser.c.
* src/types.c, src/types.h, src/ways.h, src/waysx.c:
Change the wayprop_t type into properties_t.
* src/nodesx.h, src/osmparser.c, src/profiles.c, src/profiles.h, src/relationsx.c,
src/relationsx.h, src/types.c, src/types.h, src/ways.h, src/waysx.c, src/filedumper.c,
src/nodes.h, src/nodesx.c:
Change the allow_t type into transports_t (and associated enums and macros).
* src/types.h, src/ways.h: Change the waytype_t type into highway_t.
2010-11-14 Andrew M. Bishop <amb>
* xml/routino-tagging.xml:
Fix mis-spelling with surface=asphalt tag (patch from Michael Günnewig).
* src/filedumper.c, src/types.c, src/types.h, src/ways.h, src/waysx.c:
Print out statistics about what highways are included in the database.
2010-11-13 Andrew M. Bishop <amb>
Version 1.5.1 released
2010-11-13 Andrew M. Bishop <amb>
* doc/NEWS.txt, doc/README.txt: Updated for version 1.5.1.
* doc/USAGE.txt: Update program usage for new logging option.
* xml/routino-translations.xml:
Add translation for ferry into German (patch from Michael Günnewig).
* src/relationsx.c: Fix bug with relation processing.
* src/logging.h: Add GCC attributes for the logging functions.
* src/logging.h, src/logging.c: New file.
* src/Makefile, src/nodesx.c, src/optimiser.c, src/osmparser.c, src/planetsplitter.c,
src/relationsx.c, src/router.c, src/segmentsx.c, src/superx.c, src/tagmodifier.c,
src/waysx.c:
Add an option to make the output more suitable for a log file.
2010-10-31 Andrew M. Bishop <amb>
* src/files.c:
Ensure that enough memory gets allocated in FileName() function.
2010-10-30 Andrew M. Bishop <amb>
Version 1.5 released
2010-10-30 Andrew M. Bishop <amb>
* doc/README.txt, doc/NEWS.txt: Updated for version 1.5.
2010-10-18 Andrew M. Bishop <amb>
* src/profiles.c:
Use sqrt() function to reduce the effect of property preferences close to 50%.
Ensure that preferences cannot equal zero (error on division).
* doc/ALGORITHM.txt, doc/INSTALL.txt, doc/USAGE.txt:
Updated with information about the new features.
* doc/CONFIGURATION.txt, doc/TAGGING.txt:
Add in the footroute and bicycleroute configuration options and route relation
tag processing.
2010-10-16 Andrew M. Bishop <amb>
* src/files.c: Fixed some comments for recent changes.
2010-10-09 Andrew M. Bishop <amb>
* xml/routino-profiles.xml:
Add footroute and bicycleroute to the profiles.
* src/files.c, src/files.h, src/relationsx.c:
The ReOpenFile() function cannot be read/write because it stops the router
running with read-only access to the database.
* src/nodesx.c, src/relationsx.c, src/segmentsx.c, src/superx.c:
Fix previous check-in on this set of files.
* src/xmlparse.l: Ensure that comparisons are made with unsigned chars.
2010-10-03 Andrew M. Bishop <amb>
* src/nodesx.c, src/relationsx.c, src/segmentsx.c, src/superx.c:
Don't try mapping a file if it is zero length (e.g. no super-segments).
* src/files.c, src/files.h, src/relationsx.c:
Add a function to map a file writeable and use it for updating the ways when
processing route relations.
* src/relationsx.c:
Avoid self-recursion and adding route information to relations that already have
it.
2010-09-25 Andrew M. Bishop <amb>
* src/osmparser.c, src/relationsx.c, src/relationsx.h, src/waysx.h:
Apply the route=bicycle or route=foot tags from the relation to all ways
contained in it and to all ways in all sub-relations of it (including recursion
to depth 5). This requires all relations to be stored even if not routes
because they might be included by another relation that is.
* src/segmentsx.c: Don't sort the (super-)segments if there are none.
* src/nodesx.c, src/functions.h, src/sorting.c:
Rename the heapsort() function to filesort_heapsort().
2010-09-19 Andrew M. Bishop <amb>
* src/files.c, src/files.h, src/nodesx.c, src/segmentsx.c, src/sorting.c, src/waysx.c:
Change the names of the functions used to open files, change the ReOpen function
to open R/W.
* src/relationsx.c: Remove the sorting of the route relations.
2010-09-17 Andrew M. Bishop <amb>
* src/nodesx.c, src/segmentsx.c:
Zero the NodesFile and SegmentsFile data structures before writing them (zeros
unused bytes).
* src/planetsplitter.c, src/waysx.c, src/waysx.h:
Split the sorting of waysx from the compacting so that the route relation
information can be included before compacting.
* xml/routino-tagging.xml, src/functionsx.h, src/osmparser.c, src/planetsplitter.c:
Parse relations and extract foot and bicycle routes to be added as properties to
the ways.
* src/types.c, src/types.h: Add footroute and bicycleroute properties.
* src/relationsx.c, src/relationsx.h: New file.
* src/typesx.h, src/Makefile:
Add files and datatypes for processing relations.
* xml/routino-tagging-nomodify.xml, xml/routino-tagging.xsd, src/tagging.c:
Process tags for relations.
2010-09-16 Andrew M. Bishop <amb>
* src/waysx.c, src/segmentsx.c, src/nodesx.c:
Fix the comment for the Append...() function.
2010-09-15 Andrew M. Bishop <amb>
* xml/routino-profiles.xml, xml/routino-tagging.xml, xml/routino-translations.xml,
src/output.c, src/translations.c, src/types.c, src/types.h:
Add routing on ferries.
* src/filedumper.c, src/planetsplitter.c, src/router.c:
Bug fix for last change.
* src/filedumper.c, src/planetsplitter.c, src/router.c:
Improve the usage information to tell which command line argument was in error.
* src/profiles.c:
Fix --help-profile-perl option and make perl and JSON outputs more pretty.
* src/router.c, src/planetsplitter.c:
Usage message has wrong option name.
* src/xmlparse.l:
Fix last change to make UTF-8 parsing more strict, also added strict conversion
to XML-safe character references.
* src/translations.c:
Convert translations read from file into XML-safe encodings before using them.
* src/output.c: HTML file has UTF-8 meta-tag.
* xml/routino-translations.xml:
Revert to UTF-8 multi-byte representations instead of character references.
2010-09-14 Andrew M. Bishop <amb>
* src/xmlparse.l: Stricter checking on XML data (Unicode).
2010-09-05 Andrew M. Bishop <amb>
* xml/Makefile, src/Makefile, doc/Makefile, Makefile:
Move all of the installation pathnames to the top level Makefile and include it
into the lower level makefiles.
* src/planetsplitter.c, src/router.c, src/tagmodifier.c:
Use the installed tagging.xml, profiles.xml or translations.xml files as the
fallback option if no other given.
2010-09-04 Andrew M. Bishop <amb>
* xml/routino-translations.xml:
Change German translations from named HTML character encodings to numeric ones
(works in GPX files as well as HTML).
* xml/routino-translations.xml:
Added Dutch translations (from Jan Jansen).
2010-08-30 Andrew M. Bishop <amb>
* xml/routino-translations.xml:
Change German translation to UTF-8, add comments indicating the origin of the
two translations.
* xml/routino-tagging-nomodify.xml:
Relation rules are not allowed at all.
* xml/Makefile, src/Makefile, doc/Makefile, Makefile:
Added 'install' to top level (and lower) Makefiles.
* src/ways.h, src/output.c:
Change the names of the functions used to get the highway names.
* src/filedumper.c:
Only print the way name in OSM output when the way has a name.
Change the names of the functions used to get the highway names.
* src/profiles.c: Fix bug with writing out JSON profile information.
2010-08-30 Andrew M. Bishop <amb>
* src/ways.h, src/output.c:
Change the names of the functions used to get the highway names.
* src/filedumper.c:
Only print the way name in OSM output when the way has a name.
Change the names of the functions used to get the highway names.
* src/profiles.c: Fix bug with writing out JSON profile information.
2010-08-04 Andrew M. Bishop <amb>
* src/output.c, src/segmentsx.c, src/types.h, src/fakes.c, src/functions.h, src/nodesx.c,
src/optimiser.c:
Change the way that fake nodes and segments are recognised (allows nearly 4G
nodes to be stored instead of 2G nodes).
2010-08-03 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.h, src/nodesx.c, src/optimiser.c, src/types.h:
Rename the variables that hold the node allowed transports and flags.
2010-08-02 Andrew M. Bishop <amb>
* xml/routino-tagging-nomodify.xml, xml/routino-tagging.xml, xml/routino-tagging.xsd,
src/filedumper.c, src/nodesx.c, src/nodesx.h, src/optimiser.c, src/osmparser.c,
src/superx.c, src/tagging.c, src/types.h:
Understand node traffic type restrictions.
2010-07-31 Andrew M. Bishop <amb>
* src/profiles.h, src/types.c, src/types.h, src/ways.h, src/waysx.c:
Rename the wayallow_t type to allow_t (since it applies to nodes as well now).
* src/filedumper.c, src/nodes.h, src/nodesx.c, src/segmentsx.c, src/types.h:
Add extra information to a node to store turn restrictions and properties.
(Move the super-node bit from the first segment to here.)
* src/nodesx.c, src/segmentsx.c, src/waysx.c:
Assert if the number of nodes, segments or ways exceeds the legal range of the
index counters.
* src/nodes.h, src/nodesx.h, src/segments.h, src/segmentsx.h, src/ways.h, src/waysx.h:
Change the data types to index_t where they are counting nodes/segments/ways.
* src/nodes.h, src/nodesx.h, src/segments.h, src/segmentsx.h, src/ways.h, src/waysx.c,
src/waysx.h:
Ensure that seeking within a file uses a 64-bit offset.
* src/nodesx.c, src/segmentsx.c, src/superx.c, src/waysx.c:
Remove the assert statements that check the order of calling the functions.
2010-07-26 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.c, src/nodes.h, src/visualiser.c:
Final part of slim mode for the router (node offsets).
2010-07-24 Andrew M. Bishop <amb>
* src/nodesx.c, src/segmentsx.c, src/waysx.c:
Some tidying up of the writing of the file headers.
* src/ways.c, src/ways.h, src/waysx.c, src/filedumper.c, src/nodes.c, src/optimiser.c,
src/output.c, src/profiles.c, src/visualiser.c:
Finished slim mode for the router by adding ways.
2010-07-23 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.c, src/nodes.h, src/output.c, src/segments.c, src/segments.h,
src/segmentsx.c:
Added slim mode to the router for segments.
* src/Makefile: Add the fakes.c file.
* src/optimiser.c, src/results.c, src/results.h:
Change the results structure to hold the index of the segment instead of a
pointer to it.
* src/types.h, src/router.c, src/functions.h:
Move the fake nodes and segments to a new file.
* src/fakes.c: New file.
2010-07-19 Andrew M. Bishop <amb>
* xml/routino-profiles.xml:
Reduce the "multilane" preference for motor vehicles. Gives too much bias with
previous setting.
2010-07-15 Andrew M. Bishop <amb>
* src/Makefile, src/filedumper.c, src/nodes.c, src/nodes.h, src/nodesx.c, src/visualiser.c:
Added a slim mode to the router (just for nodes to start with).
2010-07-14 Andrew M. Bishop <amb>
* src/segmentsx.h, src/superx.c, src/waysx.c, src/waysx.h, src/Makefile, src/nodesx.c,
src/nodesx.h, src/planetsplitter.c, src/segmentsx.c:
Replaced the runtime selection of slim mode / non-slim mode with compile time
selection that gives no runtime overhead but gives two executables.
2010-07-13 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/segmentsx.c, src/segmentsx.h, src/waysx.c, src/waysx.h:
Move the functions for slim mode out into the header file and make it inline.
2010-07-12 Andrew M. Bishop <amb>
* src/files.h: New file.
* src/segmentsx.h, src/sorting.c, src/superx.c, src/tagging.c, src/tagmodifier.c,
src/translations.c, src/ways.c, src/waysx.c, src/waysx.h, src/filedumper.c, src/files.c,
src/functions.h, src/nodes.c, src/nodesx.c, src/nodesx.h, src/optimiser.c, src/output.c,
src/planetsplitter.c, src/profiles.c, src/router.c, src/segments.c, src/segmentsx.c:
Create a files.h header and put some of the most heavily used files.c functions
into it and make them inline.
2010-07-11 Andrew M. Bishop <amb>
* src/segmentsx.c, src/segmentsx.h, src/files.c, src/nodesx.c, src/nodesx.h:
Made the planetsplitter slim mode handle the output node and segment data in a
slim way as well as in the input data.
* src/nodesx.c, src/segmentsx.c, src/waysx.c:
Change the names of the temporary files.
2010-07-10 Andrew M. Bishop <amb>
Version 1.4.1 released
2010-07-10 Andrew M. Bishop <amb>
* doc/NEWS.txt: Update NEWS for release.
* doc/ALGORITHM.txt:
Update documentation for slight modification to algorithm, also add more
information about how preferences etc are handled.
2010-07-09 Andrew M. Bishop <amb>
* src/Makefile:
Default compilation flags include optimisation and not debugging symbols.
2010-07-08 Andrew M. Bishop <amb>
* src/nodes.c:
Fix error with finding closest segment to the specified point.
* src/optimiser.c:
Bug fix for not crashing when finding the middle part of the route.
2010-07-07 Andrew M. Bishop <amb>
* src/results.c, src/optimiser.c:
Changed the amount of memory allocated for intermediate results => routes much
faster.
* src/output.c: Remove compilation warning.
* src/Makefile:
Copy files to web directory like done in other Makefiles.
* doc/Makefile:
Change location of HTML files in web directory and clean up web directory on distclean.
* src/xml/Makefile: Stop message being printed when make runs.
* xml/Makefile:
Fix error from last checkin and clean up web directory on distclean.
2010-07-06 Andrew M. Bishop <amb>
* src/optimiser.c:
Don't crash if the middle part of the route can't be found but exit cleanly.
2010-07-05 Andrew M. Bishop <amb>
* src/superx.c: Change the algorithm used to determine supernodes.
2010-07-03 Andrew M. Bishop <amb>
* xml/routino-translations.xml:
Added German translation [patch from Christoph Eckert].
* src/translations.c:
Don't crash if more than one language is in translations.xml but --language
option is not used.
2010-06-28 Andrew M. Bishop <amb>
* src/router.c: Don't crash if start and finish are the same point.
2010-06-27 Andrew M. Bishop <amb>
* doc/DATA.txt: New file.
* doc/ALGORITHM.txt, doc/CONFIGURATION.txt, doc/INSTALL.txt, doc/OUTPUT.txt, doc/README.txt,
doc/TAGGING.txt, doc/USAGE.txt:
Updated documentation to match new web site.
* doc/Makefile: New file.
* xml/Makefile: Add some new variables.
2010-06-26 Andrew M. Bishop <amb>
* xml/routino-profiles.xml, xml/routino-tagging-nomodify.xml, xml/routino-tagging.xml,
xml/routino-translations.xml, src/translations.c:
Changed URLs to http://www.routino.org/
* doc/README.txt: *** empty log message ***
* doc/OUTPUT.txt: Changed URLs to http://www.routino.org/
2010-05-31 Andrew M. Bishop <amb>
Version 1.4 released
2010-05-31 Andrew M. Bishop <amb>
* doc/INSTALL.txt, doc/NEWS.txt, doc/README.txt:
Update for version 1.4.
* src/xml/Makefile: Make sure that distclean really cleans up.
* Makefile: Make sure that xml sub-directory is made.
* src/router.c:
Fix the code that should stop routing if no segment is found.
2010-05-30 Andrew M. Bishop <amb>
* doc/USAGE.txt:
Add the planetsplitter tagging rules option (and remove the unnecessary options
that it replaces), add the filedumper OSM dump option and add the tagmodifier
program.
* doc/TAGGING.txt: Describe the new tagging rules.
* doc/OUTPUT.txt: Note that the HTML and GPX outputs are translated.
* doc/CONFIGURATION.txt: Add the tagging rules configuration file.
* doc/ALGORITHM.txt: An update to the current size of the UK database.
* xml/routino-tagging-nomodify.xml: New file.
* src/tagmodifier.c:
A tagging XML file must be read (just like planetsplitter).
* src/filedumper.c:
Add the option to dump a region rather than all and to not output super
segments.
* src/optimiser.c: Fix printing the number of super-segments tried.
2010-05-29 Andrew M. Bishop <amb>
* xml/routino-translations.xml, xml/routino-translations.xsd, src/ways.h, src/filedumper.c,
src/osmparser.c, src/output.c, src/translations.c, src/translations.h:
Translate the names given to unnamed roads (the highway type).
* src/profiles.c, src/profiles.h, src/router.c:
Stricter check on specified profile before routing.
* src/router.c: Ensure that if no segment is found the routing stops.
* src/nodes.c:
When finding a closest segment one of the nodes must be within the search
distance.
2010-05-28 Andrew M. Bishop <amb>
* src/router.c: Make sure that some profiles are loaded.
2010-05-27 Andrew M. Bishop <amb>
* src/optimiser.c, src/profiles.c:
Fix bug with profile preferences (used incorrectly in route optimisation).
* src/Makefile, src/filedumper.c, src/types.c, src/types.h:
Add an option to filedumper to dump an OSM format file.
2010-05-25 Andrew M. Bishop <amb>
* src/xmlparse.l: Fix bug with encoding XML strings.
2010-05-23 Andrew M. Bishop <amb>
* xml/Makefile:
Make sure that modified files are copied to web directory.
* src/tagmodifier.c:
Fix bug when filename is specified on command line.
* src/tagging.c, src/tagging.h, src/tagmodifier.c, src/xmlparse.l, src/osmparser.c:
Fix some memory leaks.
* src/tagmodifier.c, xml/osm.xsd, xml/routino-osm.xsd, src/osmparser.c:
Add the 'bound' element to the XML parser.
2010-05-22 Andrew M. Bishop <amb>
* src/functionsx.h, src/osmparser.c, src/planetsplitter.c, src/ways.h, src/waysx.c,
src/waysx.h:
Remove the --transport=<transport>, --not-highway=<highway> and
--not-property=<property> options from planetsplitter because they can be done
by the tagging.xml file now.
2010-05-18 Andrew M. Bishop <amb>
* src/Makefile: Add tagmodifier program.
* src/xmlparse.l: Handle floating point numbers in scientific notation.
* src/planetsplitter.c:
Read in the tag transformation rules before calling the OSM parser.
* src/functionsx.h, src/osmparser.c:
Almost completely re-written OSM parser using tagging transformations.
* src/tagmodifier.c, src/tagging.h, src/tagging.c: New file.
* xml/Makefile: Copy the tagging rules to the web directory.
* xml/routino-tagging.xml, xml/routino-tagging.xsd, xml/routino-osm.xsd:
New file.
* xml/osm.xsd: Small fix for OSM schema.
2010-05-14 Andrew M. Bishop <amb>
* src/types.c: Remove highway type aliases from HighwayType() function.
* src/xmlparse.h, src/xmlparse.l: Allow empty strings to be returned.
2010-05-10 Andrew M. Bishop <amb>
* src/xmlparse.h, src/xmlparse.l:
The line number is now a long integer.
* src/xml/Makefile: Running 'make test' now compiles everything first.
2010-04-28 Andrew M. Bishop <amb>
* src/xml/Makefile: Delete zero length file if xsd-to-xmlparser fails.
* src/nodes.c, src/nodesx.c, src/segments.c, src/segmentsx.c, src/ways.c, src/waysx.c:
Change file format to allow 64-bit off_t type with 32 bit void* type.
* src/Makefile, src/filedumper.c, src/xml/Makefile:
Compile with _FILE_OFFSET_BITS=64 to get 64-bit fopen() and stat().
2010-04-27 Andrew M. Bishop <amb>
* src/output.c: Fix mistake of writing GPX information to wrong file.
* doc/OUTPUT.txt, doc/CONFIGURATION.txt: New file.
* doc/TAGGING.txt, doc/USAGE.txt, doc/ALGORITHM.txt, doc/INSTALL.txt, doc/NEWS.txt,
doc/README.txt:
Interim checkin of updated documentation.
2010-04-24 Andrew M. Bishop <amb>
* src/router.c:
Merged the three functions to output the head/body/tail of the results back into
a single function. Added the '--output-none' option.
* src/functions.h, src/output.c:
Merged the three functions to output the head/body/tail of the results back into
a single function.
* xml/routino-translations.xml, xml/routino-translations.xsd, src/output.c,
src/translations.c, src/translations.h:
Added translations for the HTML output.
* src/xmlparse.h, src/xmlparse.l: Changed functions from const.
* src/output.c:
Add the copyright information into the translations.xml file instead of the
separate copyright.txt file. Add the translated copyright strings into the
outputs.
* src/functions.h, src/router.c, src/translations.c, src/translations.h:
Add the copyright information into the translations.xml file instead of the
separate copyright.txt file.
* src/xmlparse.h, src/xmlparse.l:
Add an option to not convert the XML strings into decoded representations (saves
converting them back later for the translated strings).
2010-04-23 Andrew M. Bishop <amb>
* src/xml/xsd-to-xmlparser.c, src/translations.c, src/xmlparse.h, src/xmlparse.l,
src/profiles.c:
Pass the tag name to the tag function.
2010-04-22 Andrew M. Bishop <amb>
* Makefile: Fix bug in makefile.
* xml/Makefile: Move the translations into the web directory.
* xml/routino-translations.xml, xml/routino-translations.xsd: New file.
* src/output.c: Changed HTML output to be useful in web pages.
* src/xmlparse.l:
Restart properly so that a different file can be read.
2010-04-13 Andrew M. Bishop <amb>
* src/xml/xsd-to-xmlparser.c, src/profiles.c, src/translations.c:
Name the tag variables and functions after the XSD data type and not the tag
name that uses it.
2010-04-12 Andrew M. Bishop <amb>
* src/profiles.c, src/translations.c, src/xmlparse.h, src/xmlparse.l,
src/xml/xsd-to-xmlparser.c, src/xml/Makefile:
Change the last parameter to the ParseXML function to be general options.
* src/Makefile, src/types.h, src/ways.c, src/ways.h:
Move the type checking/printing functions from way.c to type.c.
* src/types.c: New file.
2010-04-11 Andrew M. Bishop <amb>
* src/xml/xsd-to-xmlparser.c, src/profiles.c, src/translations.c, src/xmlparse.h,
src/xmlparse.l:
Added helper functions for parsing strings into numbers.
Added macros to perform common error checking.
Change XML parser callback functions to return an error status.
2010-04-10 Andrew M. Bishop <amb>
* src/router.c: Fix usage information.
* src/translations.h, src/translations.c: New file.
* src/output.c: Added translations for GPX and turn/heading.
* src/Makefile, src/router.c:
Added file of translations and language selection.
2010-04-09 Andrew M. Bishop <amb>
* src/functions.h, src/planetsplitter.c, src/sorting.c:
Add an option '--sort-ram-size' to specify the RAM to use for sorting - defaults
to 256MB if not using slim mode.
2010-04-08 Andrew M. Bishop <amb>
* src/xml/Makefile: Fix test program generation and running.
* src/xmlparse.h, src/xmlparse.l:
Make the strings const and add the number of attributes to the xmltag structure.
Add functions to convert character entities and character references.
* src/profiles.c, src/xml/xsd-to-xmlparser.c:
Make the strings const and add the number of attributes to the xmltag structure.
2010-04-07 Andrew M. Bishop <amb>
* xml/Makefile: New file.
2010-04-06 Andrew M. Bishop <amb>
* src/Makefile:
Remove special lex/flex flags. Remove profiles.o from planetsplitter.
* src/xml/xsd-to-xmlparser.c:
Don't print anything for attributes that are not set.
* src/xmlparse.l:
Change error message for bad character in a quoted string.
Make sure attribute values are cleared before calling tag function (for
end-tags).
2010-04-04 Andrew M. Bishop <amb>
* src/xml/Makefile: Add some XML parsing test cases.
* src/xml/xsd-to-xmlparser.c: Rename the XML handling function.
* src/xmlparse.h, src/xmlparse.l, src/profiles.c: Added error checking.
2010-04-03 Andrew M. Bishop <amb>
* src/functionsx.h, src/osmparser.c, src/planetsplitter.c:
Rename the old ParseXML() function as ParseOSM().
2010-04-01 Andrew M. Bishop <amb>
* src/output.c: Wrap GPX descriptions in CDATA.
2010-03-31 Andrew M. Bishop <amb>
* xml/routino-profiles.xml: New file.
* src/xml/xsd-to-xmlparser.c, src/profiles.c, src/xmlparse.h, src/xmlparse.l:
Call the XML tag functions for the end tags as well as the start tags.
2010-03-30 Andrew M. Bishop <amb>
* src/profiles.c, src/profiles.h:
Change the name of the --profile-json and --profile-perl options.
* src/filedumper.c, src/planetsplitter.c, src/router.c:
Improve the program help messages.
2010-03-29 Andrew M. Bishop <amb>
* src/files.c, src/functions.h, src/profiles.c, src/profiles.h, src/router.c:
Added command line option to specify a file containing profiles.
Added command line option to select profile by name from loaded set.
Use XML parser to read in the profiles.
* src/Makefile: Better handling of the xml sub-directory.
* src/xml/xsd-to-xmlparser.c:
Add the option to ignore unknown attributes.
Print out the skeleton file using static functions and variables.
* src/xml/Makefile: Keep the intermediate files.
* src/xmlparse.h, src/xmlparse.l:
Add the option to ignore unknown attributes.
2010-03-28 Andrew M. Bishop <amb>
* src/profiles.h, src/router.c, src/profiles.c:
Add an option to print out the profiles as XML format.
* src/xmlparse.h, xml/xsd.xsd, xml/osm.xsd, src/xml/xsd-to-xmlparser.c:
New file.
* src/Makefile: Added the XML subdirectory and xmlparser.c.
* src/xmlparse.l, src/xml/Makefile: New file.
2010-03-20 Andrew M. Bishop <amb>
* src/output.c: Add descriptions to each point in the GPX route file.
* src/files.c, src/functions.h, src/nodesx.c, src/output.c, src/segmentsx.c, src/waysx.c:
Move the stat() calls to find a file size into a helper function in files.c.
* src/files.c, src/output.c, src/planetsplitter.c:
Improve the error messages by adding strerror() to them.
* src/filedumper.c, src/router.c:
Don't check the return value of the functions to load the nodes, segments and
ways because those functions will exit in case of an error.
* src/nodes.c, src/segments.c, src/ways.c:
Don't check the return value of MapFile() because it will exit in case of an
error.
* src/planetsplitter.c:
Allow filenames on the planetsplitter command line.
2010-03-19 Andrew M. Bishop <amb>
* src/waysx.h, src/filedumper.c, src/files.c, src/functions.h, src/nodesx.c, src/nodesx.h,
src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h, src/superx.c, src/waysx.c:
Allow planetsplitter to be run with a --parse-only or --process-only option and
append to existing file or read from existing file.
2010-03-18 Andrew M. Bishop <amb>
* src/router.c: Fix usage message error and shuffle order.
* src/output.c, src/router.c:
Allow selection of which outputs are to be created.
2010-03-17 Andrew M. Bishop <amb>
* src/output.c: Re-order the code for HTML.
2010-03-15 Andrew M. Bishop <amb>
* src/output.c: Create a simple HTML output.
2010-03-06 Andrew M. Bishop <amb>
* src/router.c, src/nodes.c:
Speed up start/via/stop point search algorithm.
2010-03-05 Andrew M. Bishop <amb>
* src/profiles.c:
Change the format of the output for the --help-profile-{pl|js} options.
2010-01-21 Andrew M. Bishop <amb>
Version 1.3 released
2010-01-21 Andrew M. Bishop <amb>
* doc/NEWS.txt: Update to latest news.
2010-01-18 Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/TAGGING.txt, doc/INSTALL.txt:
Updated documentation.
2010-01-15 Andrew M. Bishop <amb>
* src/router.c, src/functions.h:
Change the test output formats to add turn, node type and bearing information.
2010-01-13 Andrew M. Bishop <amb>
* src/output.c:
Change the test output formats to add turn, node type and bearing information.
2009-12-16 Andrew M. Bishop <amb>
* src/router.c:
Added an option to use only nodes and not interpolate a point into a segment.
2009-12-15 Andrew M. Bishop <amb>
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c:
Added wheelchair as type of transport.
2009-12-13 Andrew M. Bishop <amb>
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c:
Add bridge and tunnel to highway properties.
2009-12-12 Andrew M. Bishop <amb>
* src/Makefile:
Ignore the error if executables cannot be copied after compiling.
* src/functions.h, src/nodesx.c, src/segmentsx.c, src/sorting.c, src/waysx.c:
Add some FILESORT_* #defines and use them.
2009-12-11 Andrew M. Bishop <amb>
* src/functions.h, src/nodesx.c, src/planetsplitter.c, src/segmentsx.c, src/sorting.c,
src/waysx.c, src/waysx.h:
Added a new function to sort variable length data - simplifies the compacting of
ways, reduces memory usage potentially required for it and simplifies the code.
2009-12-10 Andrew M. Bishop <amb>
* src/waysx.c:
Write out the list of ways without memory mapping anything.
2009-11-27 Andrew M. Bishop <amb>
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c:
Add in "multilane" as a new highway property.
2009-11-25 Andrew M. Bishop <amb>
* src/filedumper.c, src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/profiles.h,
src/router.c, src/ways.h, src/waysx.c, src/waysx.h:
Store the selected options when parsing (planetsplitter) and display them in the
statistics (filedumper) and check them when routing (router).
2009-11-23 Andrew M. Bishop <amb>
* src/osmparser.c, src/output.c, src/profiles.c, src/types.h, src/ways.c:
Add in "steps" as a new highway type.
2009-11-19 Andrew M. Bishop <amb>
* src/optimiser.c, src/router.c:
Made the verbose output consistent between different places.
2009-11-18 Andrew M. Bishop <amb>
* src/router.c: Fix bug with previous segment-splitting routing.
2009-11-14 Andrew M. Bishop <amb>
* src/optimiser.c, src/output.c, src/router.c, src/segments.h, src/functions.h, src/nodes.c,
src/nodes.h:
If a selected waypoint is not very close to an existing node then insert a fake
node in the segment that comes closest and use that instead.
2009-11-13 Andrew M. Bishop <amb>
* src/optimiser.c, src/osmparser.c, src/queue.c, src/results.c, src/results.h, src/types.h:
Added in some more constants with the value ~0.
2009-11-06 Andrew M. Bishop <amb>
* src/filedumper.c:
Check the values for the --node=, --segment= and --way= options.
2009-11-03 Andrew M. Bishop <amb>
* src/output.c, src/planetsplitter.c, src/profiles.c, src/profiles.h, src/router.c,
src/types.h, src/ways.c:
Rename Way_Unknown to Way_Count to make more sense and match the properties.
2009-11-02 Andrew M. Bishop <amb>
* src/osmparser.c: Allow the tag "paved" as well as "surface=paved".
* src/filedumper.c, src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/profiles.c,
src/profiles.h, src/router.c, src/types.h, src/ways.c, src/ways.h:
Added the ability to set routing preferences using highway properties.
Initially the only choice is either paved or unpaved but the code has been
updated to allow any number of properties to be added.
2009-10-27 Andrew M. Bishop <amb>
* src/osmparser.c:
Handle the "designation=..." tag for bridleway, byway and footpath. (Also
change to using a macro for testing if access is allowed and now allow
"destination").
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c, src/ways.h:
Added Moped to the list of transports (and incidentally increased the transport
data type to 16 bits and re-ordered the Way data-type in response).
2009-10-26 Andrew M. Bishop <amb>
* src/profiles.c:
Ensure that horses and bicycles have a default speed on trunk even though they
have a default preference not to use it.
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c:
Re-ordered the types so that Horse comes before Bicycle.
* src/osmparser.c, src/output.c, src/profiles.c, src/types.h, src/ways.c:
Remove the Bridleway and Footway highway types and use the Path type instead
(also re-ordered the types so that Cycleway comes before Path).
* src/profiles.c: Remove unneeded spaces at the end of the output.
2009-10-25 Andrew M. Bishop <amb>
* src/output.c:
Fix bug in code that determines waypoints for abbreviated output.
2009-10-24 Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/router.c:
Fix missing segments in output if start and finish points are found by the start
search.
2009-10-22 Andrew M. Bishop <amb>
* src/files.c, src/nodesx.c, src/segmentsx.c, src/sorting.c, src/superx.c, src/waysx.c:
Added some missing comments and corrected some existing ones.
2009-10-21 Andrew M. Bishop <amb>
Version 1.2 released
2009-10-21 Andrew M. Bishop <amb>
* doc/README.txt, doc/USAGE.txt, doc/NEWS.txt: Updated for version 1.2.
2009-10-20 Andrew M. Bishop <amb>
* src/Makefile: Add sorting.o to the Makefile.
2009-10-12 Andrew M. Bishop <amb>
* src/waysx.c: When sorting we cannot have NULL pointers now.
* src/nodesx.c, src/segmentsx.c, src/waysx.c:
Re-order the functions in the file into a more logical order.
No functional changes.
* src/nodesx.c, src/planetsplitter.c, src/segmentsx.c, src/sorting.c, src/waysx.c:
Rename the tmpdirname variable.
2009-10-10 Andrew M. Bishop <amb>
* src/nodesx.c, src/osmparser.c, src/segmentsx.c, src/sorting.c, src/waysx.c:
Corrections after running with valgrind.
* src/planetsplitter.c: Fix early termination test.
* src/nodesx.c, src/nodesx.h, src/segmentsx.c:
Remove the nodesx->gdata index.
2009-10-09 Andrew M. Bishop <amb>
* src/nodesx.c, src/segmentsx.c, src/typesx.h, src/waysx.c, src/waysx.h:
Free the nodesx->super array and the segmentsx->firstnode array when finished
with them. Remove wayx->cid and overwrite wayx->id instead. Overwrite
nodex[i]->id=i for later geographically sorted use.
2009-10-08 Andrew M. Bishop <amb>
* src/nodesx.c, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h, src/superx.c:
Replace node, segment and way indexes with a single index for a set of segments
containing the location of the first segment for each node.
* src/nodesx.h: Fix comment.
2009-10-07 Andrew M. Bishop <amb>
* src/osmparser.c, src/segmentsx.c, src/superx.c:
AppendSegment adds a single segment and not a pair.
* src/waysx.c: Use heapsort() instead of qsort().
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
src/superx.c, src/waysx.c:
Go back to the version 1.1 method of having each segment listed twice. This
simplifies the lookup of first/next segments at no in-RAM index cost and now
that slim mode has sorting of file contents the balance has tipped back.
2009-10-04 Andrew M. Bishop <amb>
* src/functions.h, src/sorting.c:
Change the sort function to allow the indexing callback to veto the write.
* src/nodesx.c: Remove the duplicates when sorting.
* src/waysx.c:
Sort the ways using the same method as the nodes. Also remove the duplicates.
* src/nodesx.c:
Use the new sort functions to allow sorting the data in the file without needing
to read (or mmap) the whole file into RAM at the same time.
* src/functions.h: Add some functions to perform sorting.
* src/sorting.c: New file.
* src/queue.c: Fix bug with binary heap sort.
2009-09-25 Andrew M. Bishop <amb>
* src/queue.c: Add comments describing the algorithm used.
2009-09-23 Andrew M. Bishop <amb>
* src/nodesx.c, src/waysx.c:
Simplify the de-duplication when sorting and update some comments.
2009-09-22 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h:
Remove a leftover from the last change on these files.
* src/segmentsx.c: Improve the super-segment de-duplication.
2009-09-21 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c:
Remove the non-highway nodes without re-sorting the whole list again.
2009-09-17 Andrew M. Bishop <amb>
* src/osmparser.c, src/planetsplitter.c, src/segmentsx.c, src/superx.c, src/waysx.c,
src/waysx.h:
Added the slim mode to Ways as well.
* src/ways.h: Add padding to Ways structure to allow it to be zeroed.
* src/nodesx.c: Add some comments when closing and re-opening files.
* src/files.c, src/functions.h:
The WriteFile function now has a const parameter.
2009-09-15 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c:
Some bug fixes and some missing unmap function calls.
2009-09-07 Andrew M. Bishop <amb>
* src/segmentsx.h, src/superx.c, src/nodesx.c, src/nodesx.h, src/segmentsx.c:
Fixed slim mode for segments and nodes (slim now means mapping only one file
into RAM at a time and none when creating the final output).
2009-09-06 Andrew M. Bishop <amb>
* src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h, src/superx.c,
src/superx.h, src/nodesx.c:
Slim version of segments code (still very slow and only works on simple cases).
* src/files.c, src/functions.h:
Remove the delete option from UnmapFile() and make it return NULL.
* src/filedumper.c: Allow dumping all nodes, segments or ways.
2009-09-05 Andrew M. Bishop <amb>
* src/nodesx.c: Don't re-sort unnecessarily.
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/superx.c:
Improve slim mode for nodes so that no data is not loaded into RAM at all.
* src/files.c, src/functions.h: Add some more file functions.
2009-09-03 Andrew M. Bishop <amb>
* src/nodesx.c, src/files.c, src/functions.h:
Remove extra argument from MapFile function.
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/superx.c:
Added slim mode (--slim) to planetsplitter for nodes only.
* src/files.c, src/functions.h:
Changes to mapping and unmapping files for slim mode.
2009-08-25 Andrew M. Bishop <amb>
* src/planetsplitter.c: Revert the order that the functions are called.
* src/nodesx.c: Fix for assert statement.
* src/files.c: Bug fix for mmap().
2009-08-20 Andrew M. Bishop <amb>
* src/osmparser.c: Fix bug with memory allocation.
2009-08-19 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
src/superx.c, src/waysx.c, src/waysx.h:
Remove "sorted" parameter in data structure and change assert statements.
2009-08-17 Andrew M. Bishop <amb>
* src/router.c:
Increase to 99 the number of waypoints that can be specified.
2009-08-15 Andrew M. Bishop <amb>
* src/queue.c: Fix comment.
* src/Makefile:
Tidy the compilation options to make it easier to turn them on and off.
* src/router.c:
Remove the --all, --super and --no-output command line options.
Handle the renamed routing functions.
* src/functions.h, src/optimiser.c:
Rename the routing functions and make FindRoute only find routes with no
super-nodes in them.
* src/queue.c:
When popping from queue make sure that place in queue is cleared.
* src/optimiser.c, src/queue.c, src/results.c, src/results.h, src/superx.c:
Optimise the priority queue used for routing.
* src/filedumper.c: Fix dumping nodes when they are super-nodes.
2009-07-23 Andrew M. Bishop <amb>
* src/Makefile, src/optimiser.c, src/results.c, src/results.h, src/superx.c:
Split off queue functions into a separate file.
* src/queue.c: New file.
2009-07-19 Andrew M. Bishop <amb>
* src/nodesx.c, src/segments.h, src/segmentsx.c, src/ways.h, src/waysx.c, src/filedumper.c,
src/nodes.h:
Include the number of super-nodes, super-segments etc in the database as useful
information to put in the statistics output.
* src/superx.c: Fix incorrect progress indicator message.
* src/waysx.c: Fix problem with memory reallocation.
* src/nodesx.c, src/osmparser.c, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
src/superx.c:
Store only one copy of each segment but index once for each direction.
2009-07-12 Andrew M. Bishop <amb>
* src/functionsx.h, src/nodesx.c, src/nodesx.h, src/osmparser.c, src/output.c,
src/planetsplitter.c, src/profiles.c, src/results.c, src/segments.c, src/segmentsx.c,
src/segmentsx.h, src/superx.c, src/superx.h, src/ways.h, src/waysx.c, src/waysx.h:
Tidy up and fix comments and include files.
* src/osmparser.c, src/planetsplitter.c, src/router.c, src/segmentsx.c, src/superx.c,
src/waysx.c, src/filedumper.c, src/nodesx.c, src/optimiser.c:
Check all print statements and made them more consistent and/or accurate.
2009-07-11 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/waysx.c,
src/waysx.h:
Free memory at the end of planetsplitter (to aid finding potential leaks
earlier).
2009-07-09 Andrew M. Bishop <amb>
* src/segmentsx.c: Free memory correctly (really).
* src/planetsplitter.c, src/waysx.c, src/waysx.h:
Separate the sorting of Ways from compacting of Ways.
* src/nodes.h, src/nodesx.c, src/nodesx.h, src/segmentsx.c, src/visualiser.c,
src/filedumper.c, src/nodes.c:
Rename structure members after recent changes.
* src/segmentsx.c: Free memory correctly.
* src/types.h, src/segmentsx.c: Fix duplicate checking.
* src/planetsplitter.c: Ensure that variable is reset before using it.
* src/types.h, src/visualiser.c, src/visualiser.h, src/filedumper.c, src/nodes.c,
src/nodes.h, src/nodesx.c, src/nodesx.h, src/optimiser.c, src/osmparser.c, src/output.c,
src/router.c, src/segments.c, src/segments.h, src/segmentsx.c:
Change from float to double for latitude and longitude.
Store latitude and longitude as an integer type rather than float (higher precision).
2009-07-08 Andrew M. Bishop <amb>
* src/superx.c: Ensure that variable is reset before using it.
2009-07-06 Andrew M. Bishop <amb>
* src/visualiser.c:
Print all super-segments within and crossing the border.
Don't display speed limits for tracks and paths unless set.
2009-07-04 Andrew M. Bishop <amb>
* src/segmentsx.h, src/superx.c, src/waysx.c, src/waysx.h:
Change data structure to avoid calling realloc() each time to allocate more
memory.
2009-07-02 Andrew M. Bishop <amb>
* src/types.h, src/waysx.c, src/waysx.h:
Handle duplicate ways.
* src/nodes.c, src/nodesx.c, src/planetsplitter.c, src/profiles.c, src/results.c,
src/segments.c, src/segmentsx.c, src/superx.c, src/superx.h, src/types.h, src/ways.c,
src/waysx.c:
Fix some gcc pedantic warnings.
* src/files.c, src/nodesx.c, src/osmparser.c, src/results.c, src/router.c, src/segments.c,
src/segmentsx.c, src/superx.c, src/ways.c, src/waysx.c:
Removed unused header files, change assert statements, tidy some code.
2009-07-01 Andrew M. Bishop <amb>
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h, src/superx.c:
Remove the Node structure from the NodeX structure to save memory.
* src/filedumper.c:
Print latitude and longitude in degrees.
2009-06-30 Andrew M. Bishop <amb>
* src/segmentsx.h:
Re-order the data in the structure.
* src/nodesx.c, src/nodesx.h, src/osmparser.c, src/planetsplitter.c, src/segmentsx.c,
src/segmentsx.h, src/superx.c, src/waysx.h:
Remove the Segment structure from the SegmentX structure to save memory.
2009-06-29 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.h, src/nodesx.c, src/segments.c, src/segments.h,
src/segmentsx.c, src/superx.c, src/types.h:
Move the super-segment and normal-segment flags from the nodes to the distance.
Remove the NODE() macro and rename SUPER_FLAG to NODE_SUPER.
* src/waysx.c: Replace memmove with structure copy.
* src/nodesx.c, src/segmentsx.c, src/segmentsx.h, src/superx.c:
Rename SegmentsX sdata to ndata.
2009-06-25 Andrew M. Bishop <amb>
* src/waysx.c, src/waysx.h: Rename part of the structure.
* src/nodesx.c, src/nodesx.h, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h,
src/superx.c, src/waysx.h:
Undo part of the previous change - only update the Segment way index at the end.
* src/waysx.h, src/nodesx.c, src/osmparser.c, src/planetsplitter.c, src/segmentsx.c,
src/segmentsx.h, src/superx.c, src/superx.h, src/typesx.h, src/waysx.c:
Reduce the number of ways in the output by compacting them (sharing the same
information between identical ways).
2009-06-24 Andrew M. Bishop <amb>
* src/filedumper.c, src/nodes.h:
Allow dumping out of nodes, segments and ways.
2009-06-15 Andrew M. Bishop <amb>
* src/segmentsx.c, src/superx.c, src/visualiser.c, src/ways.c, src/ways.h:
Rename WaysSame() with WaysCompare() and reverse the sense of the output.
* src/functionsx.h, src/typesx.h: New file.
* src/functions.h, src/nodesx.h, src/osmparser.c, src/planetsplitter.c, src/segmentsx.h,
src/superx.h, src/types.h, src/waysx.h:
Put some of types.h into typesx.h (for extended data types).
Put some of functions.h into functionsx.h (for OSM parser).
Change included files to match.
* src/filedumper.c, src/osmparser.c, src/output.c, src/router.c, src/types.h, src/visualiser.c:
Add a macro for converting degrees to radians and radians to degrees.
* src/optimiser.c:
Fix weight, height, width, length restriction routing.
* doc/TAGGING.txt, src/osmparser.c:
Recognise tags "vehicle" and "motor_vehicle".
2009-06-13 Andrew M. Bishop <amb>
Version 1.1 released
2009-06-13 Andrew M. Bishop <amb>
* src/nodesx.c, src/planetsplitter.c, src/segmentsx.c, src/segmentsx.h:
Handle nodes that are missing from the .osm file (ignore the segment).
* src/nodesx.c:
Revert the last change (Print an error message and exit if a node cannot be found).
* doc/NEWS.txt: New file.
* src/Makefile:
Delete the executables from the web directory for 'distclean'.
2009-06-12 Andrew M. Bishop <amb>
* doc/USAGE.txt, doc/INSTALL.txt, doc/README.txt:
Update the documentation.
* src/Makefile: Copy the executables into the web directory.
2009-06-08 Andrew M. Bishop <amb>
* src/filedumper.c: Change help text.
* src/visualiser.c:
Change format of super-node/segment visualiser output.
2009-06-07 Andrew M. Bishop <amb>
* doc/TAGGING.txt: Updated with imperial to metric conversions.
* src/Makefile: Added visualiser.c.
* src/filedumper.c: Now used for data visualisation and statistics.
* src/visualiser.h, src/visualiser.c: New file.
2009-06-05 Andrew M. Bishop <amb>
* src/osmparser.c:
Improve parsing of imperial units (mph, feet & inches).
2009-06-03 Andrew M. Bishop <amb>
* src/nodesx.c:
Print an error message and exit if a node cannot be found.
2009-05-31 Andrew M. Bishop <amb>
* src/ways.c, src/ways.h, src/waysx.c, src/waysx.h:
Move function from waysx.c to ways.c.
2009-05-29 Andrew M. Bishop <amb>
* doc/USAGE.txt:
Update usage information with new options and copyright.txt usage.
* src/nodes.c, src/nodes.h, src/router.c:
Make sure that the chosen "nearest point" is a highway that the profile allows.
2009-05-23 Andrew M. Bishop <amb>
* src/profiles.c:
Change the default profile; horses are slower, bicycles may be allowed on
footways (and similar).
2009-05-15 Andrew M. Bishop <amb>
* src/files.c, src/output.c:
Error checking on opening files (to read/write data and to write output).
2009-05-14 Andrew M. Bishop <amb>
* src/output.c, src/results.c, src/router.c, src/segments.c, src/segmentsx.c, src/superx.c,
src/types.h, src/nodes.c, src/nodesx.c, src/optimiser.c:
Replace ~0 or 0 with NO_NODE value for "no node" condition.
2009-05-13 Andrew M. Bishop <amb>
* src/output.c:
Remove one more NODE macro and fix an output formatting error.
* src/nodes.c, src/nodes.h, src/optimiser.c, src/output.c, src/router.c:
Remove some node macros, change some node function arguments.
* src/optimiser.c, src/profiles.c, src/profiles.h:
Move some common code into the profile.
* src/superx.c: Remove distance and duration from Result structure.
* src/output.c: Better junction detection.
* src/optimiser.c, src/results.c, src/results.h:
Remove distance and duration from Result structure.
2009-05-09 Andrew M. Bishop <amb>
* src/output.c:
Add better junction detection for deciding on route waypoints.
2009-05-06 Andrew M. Bishop <amb>
* src/optimiser.c, src/profiles.c, src/profiles.h, src/types.h:
Route using preferences for each highway.
* src/router.c: Print out longitude then latitude.
2009-04-30 Andrew M. Bishop <amb>
* src/results.h, src/router.c, src/superx.c, src/types.h, src/optimiser.c, src/osmparser.c,
src/planetsplitter.c, src/profiles.c, src/profiles.h, src/results.c:
First attempt at preferences for highways - uses integer arithmetic and doesn't
work well.
2009-04-27 Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/output.c, src/results.c, src/results.h, src/router.c:
Allow generating a route with intermediate waypoints.
2009-04-24 Andrew M. Bishop <amb>
* src/functions.h, src/output.c, src/router.c:
Split the output functions into separate head/body/tail.
Read in an optional copyright.txt file and include contents in output.
2009-04-23 Andrew M. Bishop <amb>
* src/profiles.c: Improve Javascript and perl print out.
* src/filedumper.c, src/files.c, src/functions.h, src/planetsplitter.c, src/router.c:
Move the filename generation to a new function.
2009-04-22 Andrew M. Bishop <amb>
* src/Makefile, src/functions.h, src/optimiser.c:
Split the function to print the output into a new file.
* src/output.c: New file.
2009-04-15 Andrew M. Bishop <amb>
* src/osmparser.c:
Fix for parsing nodes from XML (no effect on results).
2009-04-12 Andrew M. Bishop <amb>
* doc/USAGE.txt, src/optimiser.c:
Create a GPX route as well as a track.
* src/ways.c: Changed the license to Affero GPLv3.
2009-04-10 Andrew M. Bishop <amb>
* src/optimiser.c:
Add a waypoint to the GPX file for the start and finish points.
* doc/USAGE.txt:
Include more information about the output file formats.
2009-04-08 Andrew M. Bishop <amb>
Version 1.0 released
2009-04-08 Andrew M. Bishop <amb>
* Makefile: New file.
* src/Makefile: Fix dependency file generation.
* doc/USAGE.txt, doc/TAGGING.txt, doc/README.txt, doc/INSTALL.txt, doc/ALGORITHM.txt:
New file.
* src/Makefile, src/filedumper.c, src/files.c, src/functions.h, src/nodes.c, src/nodes.h,
src/nodesx.c, src/nodesx.h, src/optimiser.c, src/osmparser.c, src/planetsplitter.c,
src/profiles.c, src/profiles.h, src/results.c, src/results.h, src/router.c, src/segments.c,
src/segments.h, src/segmentsx.c, src/segmentsx.h, src/superx.c, src/superx.h, src/types.h,
src/ways.h, src/waysx.c, src/waysx.h:
Changed the license to Affero GPLv3.
2009-04-07 Andrew M. Bishop <amb>
* src/planetsplitter.c: Remove the --help-profile command line option.
2009-03-28 Andrew M. Bishop <amb>
* src/optimiser.c:
Fix file headers (again) and fix segment distance/duration for abbreviated text
output.
2009-03-24 Andrew M. Bishop <amb>
* src/osmparser.c, src/profiles.c, src/types.h, src/ways.c:
Added highway=path; defaults to foot=yes but also is defaulted for bicycle and
horse transport.
2009-03-23 Andrew M. Bishop <amb>
* src/optimiser.c: Fixed the header in the output text files.
* src/osmparser.c:
Add parsing for *=designated allowing passage along a highway.
* src/profiles.h, src/router.c, src/profiles.c:
Add a function to output default profiles as perl data structures.
2009-03-21 Andrew M. Bishop <amb>
* src/nodesx.c:
Handle duplicated nodes (e.g. from concatenated input files).
* src/optimiser.c: Add a header to the output text files.
2009-03-07 Andrew M. Bishop <amb>
* src/optimiser.c:
Renamed the *.txt output to *-all.txt and added a new shorted *.txt output.
* src/router.c: Renamed the --no-print option to --no-output.
2009-03-04 Andrew M. Bishop <amb>
* src/nodes.c: Fix bug with finding nearest node.
2009-03-03 Andrew M. Bishop <amb>
* src/superx.c: Fix the merging of super-segments.
2009-03-01 Andrew M. Bishop <amb>
* src/profiles.c, src/profiles.h:
Added more limits (weight, height, width, length).
* src/segments.c: Use the lower speed from the profile and the way.
* src/osmparser.c: Added more limits (weight, height, width, length).
Added highway=living_street and highway=services.
* src/ways.c, src/ways.h, src/optimiser.c, src/router.c, src/segmentsx.c, src/superx.c,
src/types.h:
Added more limits (weight, height, width, length).
* src/waysx.c, src/waysx.h:
Added a function to test if two ways are the same.
2009-02-28 Andrew M. Bishop <amb>
* src/nodesx.c:
Round the node location to avoid if falling into the wrong bin.
* src/nodesx.c, src/planetsplitter.c, src/segmentsx.c, src/waysx.c:
Move print statements from planetsplitter into individual functions.
* src/Makefile: Compile with optimisation and no profiling.
* src/profiles.c, src/router.c:
Add new command line options to make it more CGI friendly.
2009-02-27 Andrew M. Bishop <amb>
* src/profiles.c, src/profiles.h, src/router.c:
Print out Javascript code containing the profiles.
2009-02-24 Andrew M. Bishop <amb>
* src/segmentsx.h, src/superx.c, src/nodesx.c, src/segments.c, src/segments.h,
src/segmentsx.c:
Remove segment->next1 since it always points at the next segment or nowhere.
* src/profiles.c: Remove track from valid types for most transports.
2009-02-15 Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/router.c:
Change some function names.
* src/osmparser.c: Add in tests for motorcar=1 etc.
* src/nodes.c, src/nodes.h, src/router.c:
The search to find a node given the lat/long now searches harder.
* src/optimiser.c: Better test for failing to find a route.
* src/router.c: Change --only-super to --super.
* src/nodesx.c, src/optimiser.c, src/osmparser.c, src/router.c, src/segments.c,
src/segmentsx.c, src/types.h, src/nodes.c:
Store radians rather than degrees.
* src/segments.c, src/segmentsx.c:
Change to sinf(), cosf(), sqrtf(), asinf() functions.
* src/optimiser.c:
Set the sortby parameter to the minimum distance/duration consistent with the
travelled distance/duration and the remaining straight line distance with the
fastest possible speed.
* src/filedumper.c, src/nodes.c, src/nodes.h, src/nodesx.c, src/types.h:
Add macros for handling lat/long to bin conversions.
* src/osmparser.c: Handle oneway=1 and oneway=-1.
2009-02-10 Andrew M. Bishop <amb>
* src/results.c, src/results.h:
Added a new 'sortby' entry to the Result.
Changed node_t to index_t.
* src/router.c: Changed node_t to index_t.
* src/nodes.c, src/segments.c, src/segments.h:
Change the Distance() function to return distance_t.
2009-02-08 Andrew M. Bishop <amb>
* src/optimiser.c, src/results.c, src/results.h, src/router.c, src/superx.c:
Calculate quickest or shortest, not both.
* src/optimiser.c, src/profiles.c, src/router.c:
Give appropriate error messages if start or end of route are not possible.
2009-02-07 Andrew M. Bishop <amb>
* src/results.c:
Slight speedup by doing a linear search when looking up results and not storing
in sorted order.
* src/superx.h, src/superx.c, src/waysx.h, src/waysx.c, src/segmentsx.h, src/segmentsx.c,
src/nodesx.h, src/nodesx.c:
New file.
* src/ways.h, src/Makefile, src/filedumper.c, src/functions.h, src/nodes.c, src/nodes.h,
src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/router.c, src/segments.c,
src/segments.h, src/types.h, src/ways.c:
Split the extended data types from the normal data types.
* src/nodes.c: Return NULL if the node cannot be found.
* src/Makefile, src/filedumper.c, src/optimiser.c, src/router.c:
Add new command line options.
* src/supersegments.c: Fix some status messages.
* src/optimiser.c, src/types.h: Routing works with super-nodes now.
2009-02-06 Andrew M. Bishop <amb>
* src/ways.c, src/segments.c, src/segments.h, src/supersegments.c, src/types.h, src/nodes.c,
src/nodes.h, src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/functions.h:
Segments now not duplicated in database.
Routing with all nodes works, not with super-nodes.
2009-02-04 Andrew M. Bishop <amb>
* src/router.c: Fix usage output.
* src/ways.c, src/ways.h: Only sort once, don't store the index.
* src/planetsplitter.c, src/router.c:
Use '--*' command line arguments, not '-*'.
* src/nodes.c, src/router.c, src/segments.c, src/ways.c:
Make sure that nodes, segments and ways could be loaded.
* src/nodes.h, src/optimiser.c, src/router.c, src/segments.c, src/segments.h,
src/supersegments.c, src/types.h, src/filedumper.c, src/nodes.c:
Sort the nodes geographically and take coordinates as command line arguments.
2009-02-02 Andrew M. Bishop <amb>
* src/ways.c, src/ways.h, src/nodes.c, src/nodes.h, src/osmparser.c, src/segments.c,
src/segments.h, src/supersegments.c, src/types.h:
More variable and function name changes.
2009-02-01 Andrew M. Bishop <amb>
* src/profiles.c, src/router.c, src/segments.c, src/segments.h, src/supersegments.c,
src/ways.c, src/ways.h, src/files.c, src/functions.h, src/nodes.c, src/nodes.h,
src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/filedumper.c:
Rename some variable types.
2009-01-31 Andrew M. Bishop <amb>
* src/segments.c, src/segments.h, src/supersegments.c, src/types.h, src/ways.c, src/ways.h,
src/functions.h, src/nodes.c, src/nodes.h, src/optimiser.c, src/planetsplitter.c,
src/profiles.h, src/router.c:
Intermediate version during code cleanup.
* src/optimiser.c, src/planetsplitter.c, src/router.c, src/segments.c, src/segments.h,
src/functions.h, src/nodes.h:
Intermediate checkin, routing now working.
* src/Makefile:
Don't print out anything when creating the dependencies directory.
* src/planetsplitter.c, src/router.c:
Add command line options to specify the directory and filename prefix.
2009-01-30 Andrew M. Bishop <amb>
* src/results.c, src/planetsplitter.c: Remove gcc warning.
* src/Makefile: Move dependencies to subdir.
* src/osmparser.c: Remove gcc warning.
2009-01-29 Andrew M. Bishop <amb>
* src/functions.h, src/nodes.c, src/nodes.h, src/optimiser.c, src/planetsplitter.c,
src/router.c, src/segments.c, src/segments.h, src/supersegments.c:
Intermediate version while transitioning data format for nodes and segments.
2009-01-28 Andrew M. Bishop <amb>
* src/Makefile, src/functions.h, src/nodes.c, src/nodes.h, src/optimiser.c, src/osmparser.c,
src/planetsplitter.c, src/segments.c, src/segments.h, src/supersegments.c, src/ways.c,
src/ways.h:
Intermediate version while transitioning data format for nodes and segments.
2009-01-27 Andrew M. Bishop <amb>
* src/Makefile, src/functions.h, src/nodes.c, src/nodes.h, src/optimiser.c,
src/planetsplitter.c, src/router.c, src/segments.c, src/segments.h, src/supersegments.c,
src/ways.c, src/ways.h:
Intermediate version while transitioning data format for nodes and segments.
2009-01-26 Andrew M. Bishop <amb>
* src/osmparser.c, src/planetsplitter.c, src/segments.c, src/segments.h,
src/supersegments.c, src/ways.c, src/ways.h, src/filedumper.c, src/files.c, src/functions.h,
src/optimiser.c:
Change Segment to contain index of way not its real ID.
Don't store the real way ID to save space.
2009-01-25 Andrew M. Bishop <amb>
* src/segments.c, src/segments.h:
Slightly speed up the Duration calculation by changing the macro.
* src/osmparser.c, src/profiles.c, src/ways.c, src/ways.h:
Fix misspelling of Unclassified.
* src/planetsplitter.c, src/segments.c, src/segments.h, src/supersegments.c, src/ways.h,
src/optimiser.c:
Change the segment->way so that it contains the index of the way, not the id.
* src/profiles.c, src/profiles.h: New file.
* src/ways.c, src/ways.h, src/Makefile, src/functions.h, src/optimiser.c, src/osmparser.c,
src/planetsplitter.c, src/router.c, src/segments.c, src/segments.h:
Added profiles to define speed and allowed highways.
Added new options to planetsplitter and router to use the profiles.
2009-01-24 Andrew M. Bishop <amb>
* src/optimiser.c: Changed some variable names for clarity.
* src/planetsplitter.c: Print more information about progress.
Don't quit until 99.9% unchanged.
* src/optimiser.c, src/results.c, src/results.h, src/supersegments.c:
Change the Results structure so that the real data doesn't need to be realloc().
Add functions to access the first and subsequent elements of the Results structure.
2009-01-23 Andrew M. Bishop <amb>
* src/osmparser.c, src/planetsplitter.c:
Fix bug with not specifying a method of transport.
* src/optimiser.c, src/router.c: Proper check that it was unroutable.
* src/functions.h, src/optimiser.c, src/planetsplitter.c, src/supersegments.c:
Remove "iteration" as function argument.
* src/functions.h, src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/router.c,
src/ways.c, src/ways.h:
Add command line options to planetsplitter and router.
Select transport type (must be allowed on way for parsing).
Select highway types (ignore when parsing or routing).
* src/ways.h, src/functions.h, src/optimiser.c, src/osmparser.c, src/router.c,
src/segments.c, src/segments.h, src/ways.c:
Add enumerated type Transport.
Replace variables of AllowType with Transport where more appropriate.
Replace AllowType with Allowed.
Replace WayType with Highway.
* src/osmparser.c: Only include ways that are not Way_Unknown type.
* src/osmparser.c: Include permissive access.
* src/functions.h, src/optimiser.c, src/results.c, src/results.h, src/router.c:
Create a large or small results structure depending on how many nodes are
expected.
2009-01-22 Andrew M. Bishop <amb>
* src/results.h: Increase the number of bins to 64k.
* src/optimiser.c, src/osmparser.c, src/segments.c, src/segments.h, src/supersegments.c:
Remove INVALID_DISTANCE and INVALID_DURATION.
* src/optimiser.c, src/osmparser.c, src/supersegments.c, src/ways.c, src/ways.h:
Removed the Way_TYPE() macro.
* src/results.c, src/results.h, src/optimiser.c:
Move queue functions into results.c.
* src/filedumper.c, src/nodes.c, src/nodes.h, src/planetsplitter.c, src/router.c:
Nodes, Segments, Ways - Nodes, Segments, Ways.
* src/filedumper.c, src/nodes.c, src/nodes.h, src/segments.c, src/segments.h, src/ways.c,
src/ways.h:
Remove the choice of indexed or non-indexed data structures.
2009-01-21 Andrew M. Bishop <amb>
* src/optimiser.c:
Various small speed-ups including not-reversing direction.
* src/functions.h, src/optimiser.c, src/osmparser.c, src/router.c, src/segments.c,
src/segments.h, src/supersegments.c, src/ways.c, src/ways.h:
Calculate way speeds at routing time.
* src/supersegments.c:
Add reverse-oneway segments when creating supernodes.
Check incoming oneway streets as well as outgoing ones.
* src/osmparser.c: Don't change speed on roundabouts.
2009-01-20 Andrew M. Bishop <amb>
* src/planetsplitter.c:
Add command line options for skipping parsing and iteration limit.
* src/optimiser.c, src/osmparser.c, src/segments.c, src/segments.h, src/supersegments.c:
Remove duration from segment, calculate duration depending on speed.
2009-01-19 Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/planetsplitter.c, src/supersegments.c:
Iteratively calculate the super-segments.
* src/ways.h: Redefine Way_TYPE() to include one-way status.
2009-01-18 Andrew M. Bishop <amb>
* src/optimiser.c, src/supersegments.c:
Fix problems with way-type matching and duplicated/missing super-segments.
* src/functions.h, src/optimiser.c, src/router.c: Print out a GPX file.
* src/optimiser.c, src/filedumper.c, src/functions.h, src/planetsplitter.c, src/router.c,
src/segments.c, src/segments.h, src/supersegments.c, src/ways.c, src/ways.h:
Added Super-Ways and allow user to select method of transport.
* src/segments.c: Fix for changes made to ways.
* src/supersegments.c:
Ensure that supernodes are inserted wherever the way type changes.
* src/osmparser.c: Fill in the extra way information.
* src/ways.h:
Store more information about a way (allowed modes of transport).
* src/filedumper.c: Fix output printing.
* src/router.c: Print an error if no route can be found.
* src/optimiser.c:
Fix bugs when start and/or finish nodes are supernodes.
2009-01-17 Andrew M. Bishop <amb>
* src/Makefile: Add the option to create assembler output files.
* src/optimiser.c, src/results.c, src/results.h, src/supersegments.c:
Change the contents of the results data structure.
* src/router.c: Added an option to not print the result.
2009-01-16 Andrew M. Bishop <amb>
* src/optimiser.c, src/results.h, src/router.c:
Speed optimisation by changing the contents of the Results structure.
* src/optimiser.c:
Don't bother calculating the distance to go, it takes too long.
2009-01-14 Andrew M. Bishop <amb>
* src/planetsplitter.c: Remove bad segments and non-way nodes.
* src/nodes.c, src/nodes.h: Remove nodes which are not in highways.
Fix the sorting and create indexes after sorting, not before saving.
* src/segments.c, src/segments.h:
Remove bad segments (repeated consecutive nodes and duplicate segments).
Fix the sorting and create indexes after sorting, not before saving.
* src/supersegments.c: Use invalid distances properly.
* src/ways.c:
Fix the sort algorithm and update the indexes after sorting, not before saving.
* src/optimiser.c: Fix the bug with merging the results.
Fix the bug with not clearing the results structure properly.
* src/osmparser.c:
Add segments that correspond to the wrong way along one-way routes with an
invalid distance.
2009-01-11 Andrew M. Bishop <amb>
* src/functions.h, src/optimiser.c, src/router.c:
Routes correctly using super-nodes (not Lands End to John O'Groats though).
* src/filedumper.c, src/functions.h, src/optimiser.c, src/planetsplitter.c, src/router.c,
src/segments.h, src/supersegments.c:
Replace Junction with SuperNode.
* src/nodes.c, src/nodes.h, src/segments.h, src/ways.c, src/ways.h:
Some small changes to the nodes, segments and ways functions.
* src/Makefile, src/filedumper.c, src/functions.h, src/optimiser.c, src/planetsplitter.c,
src/results.h, src/router.c, src/segments.c, src/segments.h, src/supersegments.c:
Working version with supersegments and junctions.
2009-01-10 Andrew M. Bishop <amb>
* src/ways.c, src/ways.h, src/osmparser.c, src/segments.c:
Store more information about ways.
* src/results.h, src/results.c: New file.
* src/Makefile, src/optimiser.c:
Move the results data type into new files.
* src/nodes.h, src/segments.h, src/ways.h:
Increase the increment for the indexed array case.
* src/ways.h, src/Makefile, src/filedumper.c, src/functions.h, src/nodes.c, src/nodes.h,
src/optimiser.c, src/osmparser.c, src/planetsplitter.c, src/router.c, src/segments.c,
src/segments.h, src/supersegments.c, src/ways.c:
About to add the super-segment functionality using Segments data type to hold
them.
* src/functions.h, src/types.h:
Changed after nodes, ways and segment changes.
2009-01-09 Andrew M. Bishop <amb>
* src/segments.h: New file.
* src/segments.c:
Changed the format of the segments data type to match the nodes.
* src/nodes.h: Enable indexed arrays.
* src/ways.h: New file.
* src/ways.c:
Changed the format of the ways data type to match the nodes.
* src/nodes.c, src/nodes.h:
Changed the format of the nodes data type again.
2009-01-07 Andrew M. Bishop <amb>
* src/nodes.h: New file.
* src/nodes.c: Lots of modifications:
Two data structures - in memory (pointers) and in file (array).
Data is hashed into multiple bins.
Each function takes a nodes structure as an argument.
2009-01-06 Andrew M. Bishop <amb>
* src/supersegments.c: New file.
* src/Makefile, src/filedumper.c, src/functions.h, src/planetsplitter.c, src/types.h:
Added SuperSegments data type, but it does nothing yet.
* src/optimiser.c:
Tried to optimise the Queue data type. It was slower than the original.
2009-01-05 Andrew M. Bishop <amb>
* src/filedumper.c: Print out the longest segment.
* src/optimiser.c:
Some optimisations. Increase the number of result bins and change
find_insert_result() into insert_result().
2009-01-04 Andrew M. Bishop <amb>
* src/optimiser.c: Introduced some new data types to simplify the code.
* src/filedumper.c: Print more useful information.
* src/segments.c, src/types.h, src/ways.c, src/filedumper.c, src/functions.h, src/nodes.c,
src/optimiser.c, src/osmparser.c, src/planetsplitter.c:
Changed the node, way and segment functions and data types.
Removed 'alloced', shortened the prototype array.
Remove the automatic sorting of the data.
Added assert statements.
2009-01-03 Andrew M. Bishop <amb>
* src/ways.c: New file.
* src/router.c, src/types.h, src/Makefile, src/filedumper.c, src/functions.h,
src/optimiser.c, src/osmparser.c, src/planetsplitter.c:
Added the ways to the output.
2009-01-02 Andrew M. Bishop <amb>
* src/optimiser.c, src/osmparser.c, src/segments.c, src/types.h:
Added macros to convert between distance/km and duration/hours/minutes.
Shortened the Segment data type with shorter distances and durations.
2009-01-01 Andrew M. Bishop <amb>
* src/functions.h, src/nodes.c, src/planetsplitter.c, src/segments.c, src/types.h:
Remove the functions to initialise the node and segment arrays.
* src/optimiser.c, src/router.c, src/Makefile: Print out the results.
2008-12-31 Andrew M. Bishop <amb>
* src/types.h, src/segments.c, src/router.c, src/planetsplitter.c, src/osmparser.c,
src/optimiser.c, src/nodes.c, src/functions.h, src/files.c, src/filedumper.c, src/Makefile:
New file.
|