Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: navit-gps/navit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8dfc3d59cb3e6011496cbe9153579302b712b080
Choose a base ref
..
head repository: navit-gps/navit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 018ecf17b31fd5da0df2fee3dde4d565253dea43
Choose a head ref
Showing with 29 additions and 5 deletions.
  1. +21 −0 .readthedocs.yaml
  2. +3 −2 docs/conf.py
  3. +2 −0 docs/requirements.txt
  4. +2 −2 navit/script/osm/border_follower.pl
  5. +1 −1 navit/script/osm/osmtool.pl
21 changes: 21 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

version: 2

build:
os: "ubuntu-22.04"
tools:
python: "3.12"

# Build from the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Explicitly set the version of Python and its requirements
python:
install:
- requirements: docs/requirements.txt

formats: all

5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
master_doc = 'index'

# General information about the project.
project = u'navit'
project = 'navit'
year = datetime.now().year
author = u'The Navit Team'
author = 'The Navit Team'
html_theme = "sphinx_rtd_theme"
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
m2r2
sphinx_rtd_theme==2.0.0
readthedocs-sphinx-search==0.3.1
4 changes: 2 additions & 2 deletions navit/script/osm/border_follower.pl
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
$type=$ARGV[3];
$alt_type=$ARGV[4];
$revers=0;
$api=new Geo::OSM::APIClient(api=>'http://www.openstreetmap.org/api/0.5');
$api=new Geo::OSM::APIClient(api=>'https://api.openstreetmap.org/api/0.5');
$wayid=$first_wayid;
$path="$first_wayid";
sub error
@@ -33,7 +33,7 @@ sub error
$lath=$node->{lat}+0.01;
$lonl=$node->{lon}-0.01;
$lonh=$node->{lon}+0.01;
system("firefox 'http://www.informationfreeway.org/?lat=$lat&lon=$lon&zoom=12&layers=B000F000F' ; wget -O error.osm http://www.openstreetmap.org/api/0.5/map?bbox=$lonl,$latl,$lonh,$lath ; josm error.osm --selection=id:$last");
system("firefox 'http://www.informationfreeway.org/?lat=$lat&lon=$lon&zoom=12&layers=B000F000F' ; wget -O error.osm https://api.openstreetmap.org/api/0.5/map?bbox=$lonl,$latl,$lonh,$lath ; josm error.osm --selection=id:$last");
exit(1);
}

2 changes: 1 addition & 1 deletion navit/script/osm/osmtool.pl
Original file line number Diff line number Diff line change
@@ -138,5 +138,5 @@ sub command
$attr{$key}=$value;
shift;
}
$api=new Geo::OSM::APIClient(api=>'http://www.openstreetmap.org/api/0.6',%attr);
$api=new Geo::OSM::APIClient(api=>'https://api.openstreetmap.org/api/0.6',%attr);
command(@ARGV);