Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
ChangeLog
View file @ c335b24e
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-01-12 Andrew M. Bishop <amb>
Version 3.2 released.
......
Makefile
View file @ c335b24e
......@@ -2,7 +2,7 @@
#
# Part of the Routino routing software.
#
# This file Copyright 2009-2015 Andrew M. Bishop
# This file Copyright 2009-2015, 2018 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
......@@ -24,7 +24,7 @@ include Makefile.conf
# Sub-directories and sub-makefiles
SUBDIRS=src xml doc web extras
SUBDIRS=src xml doc web extras python
########
......
Makefile.conf
View file @ c335b24e
......@@ -2,7 +2,7 @@
#
# Part of the Routino routing software.
#
# This file Copyright 2013-2015 Andrew M. Bishop
# This file Copyright 2013-2015, 2017, 2018 Andrew M. Bishop
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
......@@ -70,8 +70,16 @@ LIBVERSION=$(SOVERSION).0.0
# Compilation programs
CC=gcc
CXX=g++
LD=gcc
ifdef CLANG
ifeq ($(CLANG),1)
CC=clang
CXX=clang++
LD=clang
endif
endif
# Maths library
LDFLAGS=-lm
......@@ -82,37 +90,49 @@ CFLAGS=-std=c99
# Warning options
CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
ifdef CLANG
ifeq ($(CLANG),1)
CFLAGS+=-Wno-missing-field-initializers
endif
endif
# Optimisation options
CFLAGS+=-O3
# Fast maths option - makes test cases fail slightly
CFLAGS+=-ffast-math
ifdef FASTMATHS
ifeq ($(FASTMATHS),0)
CFLAGS+=-fno-fast-math
endif
endif
# Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
#CFLAGS+=-march=native
# Debugging symbols
#CFLAGS+=-g
# Sanitizer for debugging memory addresses
#CFLAGS+=-fsanitize=address -fsanitize=leak
#LDFLAGS+=-fsanitize=address -fsanitize=leak
# Sanitizer for debugging undefined behaviour
#CFLAGS+=-fsanitize=undefined
#LDFLAGS+=-fsanitize=undefined
# Compile with debugging symbols
CFLAGS+=-g
# Option for compiling with sanitizer for debugging memory addresses and undefined behaviour
ifdef SANITIZE
ifeq ($(SANITIZE),1)
CFLAGS+=-fsanitize=address -fsanitize=leak -fsanitize=undefined
LDFLAGS+=-fsanitize=address -fsanitize=leak -fsanitize=undefined
endif
endif
# Extra flags for compiling libroutino shared library (visibility of symbols, shared)
CFLAGS_LIB=-fvisibility=hidden
LDFLAGS_LIB=-shared
ifeq ($(HOST),UNIX)
# Extra flags for compiling libroutino shared library (position independent code)
ifeq ($(HOST),UNIX)
CFLAGS_LIB+=-fPIC
LDFLAGS_LIB+=-fPIC
endif
ifeq ($(HOST),UNIX)
# Extra flags for compiling libroutino shared library (SONAME)
ifeq ($(HOST),UNIX)
LDFLAGS_SONAME=-Wl,-soname=libroutino.so.$(SOVERSION)
LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION)
endif
......@@ -126,8 +146,8 @@ CFLAGS+=-pthread -DUSE_PTHREADS
LDFLAGS+=-pthread -lpthread
ifneq ($(HOST),MINGW)
# Required for bzip2 support (comment these two lines out if not required)
ifneq ($(HOST),MINGW)
CFLAGS+=-DUSE_BZIP2
LDFLAGS+=-lbz2
endif
......@@ -147,7 +167,7 @@ LDFLAGS+=-lz
CFLAGS+=-D_FILE_OFFSET_BITS=64
ifneq ($(HOST),MINGW)
# Required to compile on Linux without a warning about pread() and pwrite() functions.
ifneq ($(HOST),MINGW)
CFLAGS+=-D_POSIX_C_SOURCE=200809L
endif
debian/changelog
View file @ c335b24e
routino (3.2-6) UNRELEASED; urgency=medium
routino (3.3-1) unstable; urgency=medium
* New upstream release.
* Bump Standards-Version to 4.4.0, no changes.
* Add Build-Depends-Package field to symbols files.
* Update gbp.conf to use --source-only-changes by default.
* Update copyright years for Andrew M. Bishop.
* Refresh patches.
* Add patch to fix FTBFS due to lack of python subdirectory.
-- Bas Couwenberg <sebastic@debian.org> Sun, 05 Aug 2018 20:57:00 +0200
-- Bas Couwenberg <sebastic@debian.org> Sun, 08 Sep 2019 08:19:23 +0200
routino (3.2-5) unstable; urgency=medium
......
debian/copyright
View file @ c335b24e
......@@ -4,7 +4,7 @@ Upstream-Contact: Andrew M. Bishop <amb@gedanken.org.uk>
Source: http://www.routino.org/download/
Files: *
Copyright: 2008-2017, Andrew M. Bishop <amb@gedanken.org.uk>
Copyright: 2008-2019, Andrew M. Bishop <amb@gedanken.org.uk>
License: AGPL-3+
Files: src/mman-win32.c
......
debian/patches/hardening
View file @ c335b24e
......@@ -4,8 +4,8 @@ Forwarded: not-needed
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -151,3 +151,8 @@ ifneq ($(HOST),MINGW)
# Required to compile on Linux without a warning about pread() and pwrite() functions.
@@ -171,3 +171,8 @@ CFLAGS+=-D_FILE_OFFSET_BITS=64
ifneq ($(HOST),MINGW)
CFLAGS+=-D_POSIX_C_SOURCE=200809L
endif
+
......
debian/patches/maploader
View file @ c335b24e
......@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/web/www/routino/maploader.js
+++ b/web/www/routino/maploader.js
@@ -47,14 +47,14 @@ function map_load(callbacks)
@@ -53,8 +53,8 @@ function map_load(callbacks)
if(mapprops.library == "leaflet")
{
......@@ -15,12 +15,14 @@ Forwarded: not-needed
load_js(location.pathname.replace(/\.html.*/,".leaflet.js"));
}
else
@@ -67,7 +67,7 @@ function map_load(callbacks)
}
else if(mapprops.library == "openlayers2")
{
- load_js("../openlayers/OpenLayers.js");
- load_js("../openlayers2/OpenLayers.js");
+ load_js("/javascript/openlayers/OpenLayers.js");
load_js(location.pathname.replace(/\.html.*/,".openlayers.js"));
load_js(location.pathname.replace(/\.html.*/,".openlayers2.js"));
}
--- a/web/www/routino/router.leaflet.js
+++ b/web/www/routino/router.leaflet.js
......
debian/patches/mapprops
View file @ c335b24e
......@@ -4,17 +4,7 @@ Forwarded: not-needed
--- a/web/www/routino/mapprops.js
+++ b/web/www/routino/mapprops.js
@@ -6,22 +6,22 @@ var mapprops={ // contains all propertie
// EDIT THIS below to change the map library (either 'openlayers' or 'leaflet').
- library: "openlayers",
- //library: "leaflet",
+ //library: "openlayers",
+ library: "leaflet",
// EDIT THIS above to change the map library (either 'openlayers' or 'leaflet').
@@ -15,14 +15,14 @@ var mapprops={ // contains all propertie
// EDIT THIS below to change the visible map limits
......@@ -35,7 +25,7 @@ Forwarded: not-needed
// EDIT THIS above to change the visible map limits
@@ -36,6 +36,19 @@ var mapprops={ // contains all propertie
@@ -37,6 +37,19 @@ var mapprops={ // contains all propertie
subdomains: ["a","b","c"]
},
attribution: {
......
debian/patches/python.patch 0 → 100644
View file @ c335b24e
Description: Remove python subdir, not included in upstream tarball.
Author: Bas Couwenberg <sebastic@debian.org>
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ include Makefile.conf
# Sub-directories and sub-makefiles
-SUBDIRS=src xml doc web extras python
+SUBDIRS=src xml doc web extras
########
debian/patches/rename_router
View file @ c335b24e
......@@ -58,68 +58,16 @@ Forwarded: not-needed
########
--- a/src/test/a-b-c.sh
+++ b/src/test/a-b-c.sh
@@ -105,8 +105,8 @@ for waypoint in $waypoints; do
--- a/src/test/run-one-test.sh
+++ b/src/test/run-one-test.sh
@@ -117,8 +117,8 @@ run_router()
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
mv shortest* $dir/$name-$waypoint
--- a/src/test/a-b.sh
+++ b/src/test/a-b.sh
@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
mv shortest* $dir/$name-$waypoint
--- a/src/test/a-b-c-d.sh
+++ b/src/test/a-b-c-d.sh
@@ -106,8 +106,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
mv shortest* $dir/$name-$waypoint
--- a/src/test/cycle-drive.sh
+++ b/src/test/cycle-drive.sh
@@ -106,8 +106,8 @@ for profile in $profiles; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
mv shortest* $dir/$name-$waypoint
--- a/src/test/start-1-finish.sh
+++ b/src/test/start-1-finish.sh
@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
[ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
- echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
- $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
+ echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
+ $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $@ >> $log
mv shortest* $dir/$name-$waypoint
......
debian/patches/series
View file @ c335b24e
......@@ -6,3 +6,4 @@ mapprops
hardening
#map_bounds
#use_openlayers
python.patch
doc/INSTALL.txt
View file @ c335b24e
......@@ -47,20 +47,20 @@ Quick Start Guide
cd /var/www/routino/data
sh -x create.sh
The routino web pages also requires either the OpenLayers or Leaflet
Javascript library to be downloaded and installed and scripts are
provided for this.
The routino web pages also require either the OpenLayers (older version
2 or incompatible newer version) or Leaflet (recent version) Javascript
library to be downloaded and installed; scripts are provided for this.
cd /var/www/routino/www/openlayers
cd /var/www/routino/www/openlayers2
sh -x install.sh
cd /var/www/routino/www/leaflet
sh -x install.sh
To make full use of the location search feature on the Routino web page
you will need to install some extra perl packages.
To run the Perl scripts that are used on the Routino web page you will
need to install some extra perl packages.
apt-get install libwww-perl liburi-perl libjson-pp-perl
apt-get install libcgi-pm-perl libwww-perl liburi-perl libjson-pp-perl
Finally to make the web pages work you will need to add the extra lines
to the Apache configuration file as described in the Configuration of
......@@ -134,8 +134,18 @@ Pre-Requisites
Compilation
-----------
To compile the programs just type 'make' at the top level of the source
tree.
To compile the programs just type make at the top level of the source
tree. There are a number of options that can be given when compiling to
change the compilation options:
make CLANG=1
Compile with clang instead of gcc (default is CLANG=0).
make FASTMATHS=0
Compile without fast maths option (default is FASTMATHS=1).
make SANITIZE=1
Compile with gcc (or clang) sanitizer (default is SANITIZER=0).
This program has been written to run on Linux, no cross-platform
compatibility has been specifically included but on the other hand
......@@ -206,11 +216,17 @@ Configuration of web files
+ /www/ <- The files that must be available to the web
| server are below this level.
|
+ /openlayers/ <- A directory to hold the OpenLayers library
| (optional; leaflet can be used instead).
+ /openlayers2/ <- A directory to hold the older OpenLayers v2
| library (optional; newer openlayers or leaflet
| can be used instead).
|
+ /openlayers/ <- A directory to hold the newer OpenLayers
| library (optional; older openlayers v2 or
| leaflet can be used instead).
|
+ /leaflet/ <- A directory to hold the Leaflet library.
| (optional; openlayers can be used instead).
| (optional; older openlayers v2 or newer
| openlayers can be used instead).
|
+ /routino/ <- The main HTML, Javascript, CSS and CGI files.
|
......@@ -242,25 +258,30 @@ Configuration of web files
The directory 'www' and its sub-directories are the only ones that need
to be within the web server accessible directory.
A Javascript map drawing library is required and either OpenLayers or
Leaflet can be used. The library is loaded dynamically when the HTML is
opened based on the value that is selected in 'mapprops.js'.
The directory 'www/openlayers' is for the OpenLayers Javascript library
that can be downloaded from 'http://www.openlayers.org/'. (This version
of Routino has been tested with OpenLayers library versions 2.12 and
2.13.1). The file 'www/openlayers/OpenLayers.js' and the directories
'www/openlayers/img/' and 'www/openlayers/theme/' must all exist. There
is a script in the 'www/openlayers' directory that will automatically
download the files, create an optimised 'OpenLayers.js' and copy the
files to the required locations.
The directory 'www/leaflet' is for the Leaflet Javascript library that
can be downloaded from 'http://leafletjs.com/'. (This version of Routino
has been tested with Leaflet library versions 0.7.1 and 0.7.2). The files
'www/leaflet/leaflet.js' and 'www/leaflet/leaflet.css' and the directory
'www/leaflet/images/' must all exist. There is a script in the
'www/leaflet' directory that will automatically download the files.
A Javascript map drawing library is required and either the older
OpenLayers version 2, newer Openlayers or Leaflet can be used. The
library is loaded dynamically when the HTML is opened based on the
value that is selected in mapprops.js.
The directory www/openlayers2 is for the older OpenLayers version 2
Javascript library that can be downloaded from
http://www.openlayers.org/two/. (This version of Routino has been tested
with OpenLayers library version 2.13.1). There is a script in the
www/openlayers2 directory that will automatically download the files,
create an optimised OpenLayers.js and copy the files to the required
locations.
The directory www/openlayers is for the newer version of the OpenLayers
Javascript library that can be downloaded from
http://www.openlayers.org/. (This version of Routino has been tested
with OpenLayers library version 5.3.0). There is a script in the
www/openlayers directory that will automatically download the files.
The directory www/leaflet is for the Leaflet Javascript library that
can be downloaded from http://leafletjs.com/. (This version of Routino
has been tested with Leaflet library version 1.5.1). There is a script
in the www/leaflet directory that will automatically download the
files.
The directory 'www/routino' contains the main HTML, Javascript and CSS
files as well as the CGI scripts that perform the server-side routing
......@@ -275,12 +296,12 @@ Configuration of web files
mapprops.js
The parameters in this file control the Javascript map library
(defaults to OpenLayers), the boundary of the visible map
(defaults to UK), the minimum and maximum zoom levels (defaults
to between 4 and 15 inclusive), the source of map tiles
(defaults to the main OpenStreetMap tile server), the data
editing and browsing URLs (default to the OpenStreetMap website)
and the number of waypoints allowed (defaults to 9).
(defaults to Leaflet), the boundary of the visible map (defaults
to UK), the minimum and maximum zoom levels (defaults to between
4 and 15 inclusive), the source of map tiles (defaults to the
main OpenStreetMap tile server), the data editing and browsing
URLs (default to the OpenStreetMap website) and the number of
waypoints allowed (defaults to 9).
The directory www/routino/documentation contains the HTML version of
the Routino documentation.
......@@ -309,4 +330,4 @@ Configuration of Web Server
--------
Copyright 2008-2016 Andrew M. Bishop.
Copyright 2008-2019 Andrew M. Bishop.
doc/NEWS.txt
View file @ c335b24e
Version 3.3 of Routino released : Sat Sep 7 2019
------------------------------------------------
Bug fixes:
Make the openlayers and leaflet zoom to the same level on clicking the route.
Add some more memory debug logging (for queue data structure).
Fix bug with route calculation that may not give optimum solution.
Fix parallel make to not have failed targets due to 'mkdir' race condition.
Supress compilation warnings from gcc-7 and gcc-8.
Supress compilation warnings from clang-5 and clang-5 static analyser.
Suppress runtime warnings from gcc's runtime sanitizer.
Bug fix for race condition in multi-threaded sorting algorithm.
Bug fix for HTML router when named locations are used.
Fix some error messages for consistency.
Add extra checks to avoid data overflow and file corruption in planetsplitter.
Add more checks for memory allocation success/failure.
planetsplitter:
Do not store nodes in route relations (they are not used).
Documentation:
Added an extra Perl module that is required.
Translations:
Updated German, French and Hungarian translations.
Added Italian and Spanish translations.
Added incomplete Czech translations.
OSM tagging:
Some small changes to access tagging and highway naming (prow_ref).
Add heuristics to decide what transport types are allowed on ferrys.
Web pages:
Update to use the latest version of Leaflet (1.5.1).
Add support for the latest version of OpenLayers (5.3).
Default to showing search boxes for locations not lat/long fields.
Python:
Created a Python (version 3) interface to the router and routing database.
Extras:
Update documentation.
Improve log summarisation HTML page formatting.
Note: This version is compatible with databases from versions 2.7.1 - 3.2.
Version 3.2 of Routino released : Sun Mar 12 2017
-------------------------------------------------
......
doc/README.txt
View file @ c335b24e
......@@ -73,6 +73,7 @@ Demonstration
internet in both OpenLayers and Leaflet versions:
http://www.routino.org/uk-leaflet/
http://www.routino.org/uk-openlayers2/
http://www.routino.org/uk-openlayers/
The source code download available below also includes a set of files
......@@ -80,7 +81,7 @@ Demonstration
The interactive map is made possible by use of the OpenLayers or
Leaflet Javascript library from http://www.openlayers.org/ or
http://leafletjs.com/.
http://www.openlayers.org/two/ or http://leafletjs.com/.
Documentation
......@@ -133,6 +134,7 @@ Status
Version 3.1 of Routino was released on 5th March 2016.
Version 3.1.1 of Routino was released on 6th March 2016.
Version 3.2 of Routino was released on 12th March 2017.
Version 3.3 of Routino was released on 7th September 2019.
The full version history is available in the NEWS.txt file.
......@@ -154,7 +156,7 @@ License
Copyright
---------
Routino is copyright Andrew M. Bishop 2008-2017.
Routino is copyright Andrew M. Bishop 2008-2019.
Homepage
......@@ -189,4 +191,4 @@ Subversion
--------
Copyright 2008-2017 Andrew M. Bishop.
Copyright 2008-2019 Andrew M. Bishop.
doc/TAGGING.txt
View file @ c335b24e
......@@ -387,14 +387,15 @@ Highway Defaults
cycleway yes no yes yes no no no no no no
path yes yes(2) yes yes(2) no no no no no no
steps yes no no no no no no no no no
ferry (3) no no no no no no no no no no
ferry (3) ?? ?? ?? ?? ?? ?? ?? ?? ?? ??
Note 1: A trunk road may legally allow foot, horse or wheelchair access
but in the absence of other tags is considered to be too dangerous.
Note 2: A path allows bicycle or horse access by default only if
actually labelled as a highway of type "bridleway".
Note 3: Ferry routes must be explicitly tagged with the allowed
transport types, it is not sensible to try to guess.
Note 3: Ferry routes use a set of heuristics to guess the the allowed
transport types starting with nothing allowed and then using the tags
given.
Finally for the highway tag a number of default properties are added
depending on the highway type.
......
doc/html/installation.html
View file @ c335b24e
......@@ -12,7 +12,7 @@
Part of the Routino routing software.
This file Copyright 2008-2016 Andrew M. Bishop
This file Copyright 2008-2019 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
......@@ -105,8 +105,14 @@ cd /var/www/routino/data
sh -x create.sh
</pre>
The routino web pages also requires either the OpenLayers or Leaflet Javascript
library to be downloaded and installed and scripts are provided for this.
The routino web pages also require either the OpenLayers (older version 2 or
incompatible newer version) or Leaflet (recent version) Javascript library to be
downloaded and installed; scripts are provided for this.
<pre class="boxed">
cd /var/www/routino/www/openlayers2
sh -x install.sh
</pre>
<pre class="boxed">
cd /var/www/routino/www/openlayers
......@@ -118,11 +124,11 @@ cd /var/www/routino/www/leaflet
sh -x install.sh
</pre>
To make full use of the location search feature on the Routino web page you will
To run the Perl scripts that are used on the Routino web page you will
need to install some extra perl packages.
<pre class="boxed">
apt-get install libwww-perl liburi-perl libjson-pp-perl
apt-get install libcgi-pm-perl libwww-perl liburi-perl libjson-pp-perl
</pre>
Finally to make the web pages work you will need to add the extra lines to the
......@@ -215,7 +221,17 @@ libjson-pp-perl if not part of the standard Perl installation).
<h2 id="H_1_3">Compilation</h2>
To compile the programs just type <tt>make</tt> at the top level of the source
tree.
tree. There are a number of options that can be given when compiling to
change the compilation options:
<dl>
<dt><tt>make CLANG=1</tt>
<dd>Compile with clang instead of gcc (default is <tt>CLANG=0</tt>).
<dt><tt>make FASTMATHS=0</tt>
<dd>Compile without fast maths option (default is <tt>FASTMATHS=1</tt>).
<dt><tt>make SANITIZE=1</tt>
<dd>Compile with gcc (or clang) sanitizer (default is <tt>SANITIZER=0</tt>).
</dl>
<p>
......@@ -295,11 +311,17 @@ The directory structure is as follows:
+ /www/ <- The files that must be available to the web
| server are below this level.
|
+ /openlayers/ <- A directory to hold the OpenLayers library
| (optional; leaflet can be used instead).
+ /openlayers2/ <- A directory to hold the older OpenLayers v2
| library (optional; newer openlayers or leaflet
| can be used instead).
|
+ /openlayers/ <- A directory to hold the newer OpenLayers
| library (optional; older openlayers v2 or
| leaflet can be used instead).
|
+ /leaflet/ <- A directory to hold the Leaflet library.
| (optional; openlayers can be used instead).
| (optional; older openlayers v2 or newer
| openlayers can be used instead).
|
+ /routino/ <- The main HTML, Javascript, CSS and CGI files.
|
......@@ -339,29 +361,35 @@ to be within the web server accessible directory.
<p>
A Javascript map drawing library is required and either OpenLayers or Leaflet
can be used. The library is loaded dynamically when the HTML is opened based on
the value that is selected in <tt>mapprops.js</tt>.
A Javascript map drawing library is required and either the older OpenLayers
version 2, newer Openlayers or Leaflet can be used. The library is loaded
dynamically when the HTML is opened based on the value that is selected
in <tt>mapprops.js</tt>.
<p>
The directory <tt>www/openlayers</tt> is for the OpenLayers Javascript library
that can be downloaded from http://www.openlayers.org/. (This version of
Routino has been tested with OpenLayers library versions 2.12 and 2.13.1). The
file <tt>www/openlayers/OpenLayers.js</tt> and the directories
<tt>www/openlayers/img/</tt> and <tt>www/openlayers/theme/</tt> must all exist.
There is a script in the <tt>www/openlayers</tt> directory that will
The directory <tt>www/openlayers2</tt> is for the older OpenLayers version 2
Javascript library that can be downloaded from http://www.openlayers.org/two/.
(This version of Routino has been tested with OpenLayers library version
2.13.1). There is a script in the <tt>www/openlayers2</tt> directory that will
automatically download the files, create an optimised <tt>OpenLayers.js</tt> and
copy the files to the required locations.
<p>
The directory <tt>www/openlayers</tt> is for the newer version of the
OpenLayers Javascript library that can be downloaded from
http://www.openlayers.org/. (This version of Routino has been tested with
OpenLayers library version 5.3.0). There is a script in
the <tt>www/openlayers</tt> directory that will automatically download the
files.
<p>
The directory <tt>www/leaflet</tt> is for the Leaflet Javascript library that
can be downloaded from http://leafletjs.com/. (This version of Routino has been
tested with Leaflet library versions 0.7.1 and 0.7.2). The files
<tt>www/leaflet/leaflet.js</tt> and <tt>www/leaflet/leaflet.css</tt> and the
directory <tt>www/leaflet/images/</tt> must all exist. There is a script in the
<tt>www/leaflet</tt> directory that will automatically download the files.
tested with Leaflet library version 1.5.1). There is a script in
the <tt>www/leaflet</tt> directory that will automatically download the files.
<p>
......@@ -376,7 +404,7 @@ The description below lists all of the files that contain editable information.
database; and the names of the executables.
<dt><tt>mapprops.js</tt>
<dd>The parameters in this file control the Javascript map library (defaults
to OpenLayers), the boundary of the visible map (defaults to UK), the
to Leaflet), the boundary of the visible map (defaults to UK), the
minimum and maximum zoom levels (defaults to between 4 and 15 inclusive),
the source of map tiles (defaults to the main OpenStreetMap tile server),
the data editing and browsing URLs (default to the OpenStreetMap website)
......
doc/html/readme.html
View file @ c335b24e
......@@ -12,7 +12,7 @@
Part of the Routino routing software.
This file Copyright 2008-2017 Andrew M. Bishop
This file Copyright 2008-2017, 2019 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
......@@ -127,6 +127,8 @@ both OpenLayers and Leaflet versions:
<br>
<a href="http://www.routino.org/uk-leaflet/" title="Leaflet Router">http://www.routino.org/uk-leaflet/</a>
<br>
<a href="http://www.routino.org/uk-openlayers2/" title="OpenLayers v2 Router">http://www.routino.org/uk-openlayers2/</a>
<br>
<a href="http://www.routino.org/uk-openlayers/" title="OpenLayers Router">http://www.routino.org/uk-openlayers/</a>
<p>
......@@ -140,6 +142,8 @@ The interactive map is made possible by use of the OpenLayers or Leaflet
Javascript library from
<a class="ext" href="http://www.openlayers.org" title="OpenLayers">http://www.openlayers.org/</a>
or
<a class="ext" href="http://www.openlayers.org/two/" title="OpenLayers">http://www.openlayers.org/two/</a>
or
<a class="ext" href="http://leafletjs.com" title="Leaflet">http://leafletjs.com/</a>.
......@@ -216,40 +220,54 @@ Version 3.1 of Routino was released on 5th March 2016.
Version 3.1.1 of Routino was released on 6th March 2016.
<br>
Version 3.2 of Routino was released on 12th March 2017.
<br>
Version 3.3 of Routino was released on 7th September 2019.
<p>
The full version history is available in the NEWS.txt file.
<h3 id="H_1_5_1" title="Changes 3.2">Changes in Version 3.2</h3>
<h3 id="H_1_5_1" title="Changes 3.3">Changes in Version 3.3</h3>
<dl>
<dt>Bug fixes:
<dd>Don't crash if the start &amp; finish of a route are the same point (some cases).
<br>Update installation instructions in case Apache root is not '/var/www'.
<br>Improve messages if default profiles, translations or tagging files not found.
<br>Fix an error in filedumperx detected by gcc-6 indentation checker.
<br>Ensure that selecting a language web-page defaults to that language output.
<br>Ensure that a language that is missing some translations still get valid HTML.
<br>Fix Perl scripts that include others (current directory not on include path).
<dt>Web pages:
<dd>Update to use the latest version of Leaflet (0.7.7).
<br>Move the route buttons to be above the waypoints so they stay on screen.
<br>Remove MapQuest as an optional tile source (no longer available).
<br>Adjust some CSS and HTML so that the layout is preserved when zooming.
<dd>Make the openlayers and leaflet zoom to the same level on clicking the route.
<br>Add some more memory debug logging (for queue data structure).
<br>Fix bug with route calculation that may not give optimum solution.
<br>Fix parallel make to not have failed targets due to 'mkdir' race condition.
<br>Supress compilation warnings from gcc-7 and gcc-8.
<br>Supress compilation warnings from clang-5 and clang-5 static analyser.
<br>Suppress runtime warnings from gcc's runtime sanitizer.
<br>Bug fix for race condition in multi-threaded sorting algorithm.
<br>Bug fix for HTML router when named locations are used.
<br>Fix some error messages for consistency.
<br>Add extra checks to avoid data overflow and file corruption in planetsplitter.
<br>Add more checks for memory allocation success/failure.
<dt>planetsplitter:
<dd>Do not store nodes in route relations (they are not used).
<dt>Documentation:
<dd>Added an extra Perl module that is required.
<dt>Translations:
<dd>Updated French, German, Polish &amp; Russian translations.
<dd>Updated German, French and Hungarian translations.
<br>Added Italian and Spanish translations.
<br>Added incomplete Czech translations.
<dt>OSM tagging:
<dd>Handle more tags like access:foot=* by translating them to foot=*.
<dt>router:
<dd>Ignore junctions forbidden by turn restrictions when describing route.
<dd>Some small changes to access tagging and highway naming (prow_ref).
<br>Add heuristics to decide what transport types are allowed on ferrys.
<dt>Web pages:
<dd>Update to use the latest version of Leaflet (1.5.1).
<br>Add support for the latest version of OpenLayers (5.3).
<br>Default to showing search boxes for locations not lat/long fields.
<dt>Python:
<dd>Created a Python (version 3) interface to the router and routing database.
<dt>Extras:
<dd>Don't crash in the statistics dumper if some ways are *very* long.
<dd>Update documentation.
<br>Improve log summarisation HTML page formatting.
</dl>
<p>
<b>Note:</b> This version is compatible with databases from versions 2.7.1 - 3.1.1.
<b>Note:</b> This version is compatible with databases from versions 2.7.1 - 3.2.
<h2 id="H_1_6">License</h2>
......@@ -270,7 +288,7 @@ software.
<h3 id="H_1_6_1">Copyright</h3>
Routino is copyright Andrew M. Bishop 2008-2017.
Routino is copyright Andrew M. Bishop 2008-2019.
<h2 id="H_1_7">Homepage</h2>
......
doc/html/tagging.html
View file @ c335b24e
......@@ -12,7 +12,7 @@
Part of the Routino routing software.
This file Copyright 2008-2015 Andrew M. Bishop
This file Copyright 2008-2015, 2019 Andrew M. Bishop
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
......@@ -700,16 +700,16 @@ below.
<td class="center">no
<tr>
<td class="left">ferry (3)
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">no
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
<td class="center">??
</table>
<p>
......@@ -721,8 +721,8 @@ below.
Note 2: A path allows bicycle or horse access by default only if actually
labelled as a highway of type "bridleway".
<br>
Note 3: Ferry routes must be explicitly tagged with the allowed transport
types, it is not sensible to try to guess.
Note 3: Ferry routes use a set of heuristics to guess the the allowed transport
types starting with nothing allowed and then using the tags given.
</i>
<p>
......
extras/README.txt
View file @ c335b24e
......@@ -25,3 +25,6 @@ plot-time - Plots the output of 'planetsplitter --loggable --logtime' to show
find-fixme - A modified version of the Routino planetsplitter and filedumper
programs to scan an OSM file for "fixme" tags and create a
database so that web pages provided can display them.
statistics - A collection of scripts and compiled code to extract statistics
from the Routino database and create a map of the data.