Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged back from WIP and some improvements as: #10

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Merged back from WIP and some improvements as: #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0c4b673
find country in which highway is
knowname Feb 18, 2016
5590b54
uses areacode_1 to determine country of a street. => highway=? depend…
knowname Feb 19, 2016
8a7b00c
allows different func_class mappings for different countries
knowname Feb 19, 2016
f0afcc9
adds testdata to fix tests
knowname Feb 24, 2016
15b603c
Add 'ref'-tags to highways
Feb 26, 2016
84a1a99
Merge origin/wip into wip
Feb 29, 2016
e2265ee
Add waterways and water polygons
Mar 3, 2016
4049fce
Fixed road type mappings
Mar 4, 2016
44ccbad
Parsing hazardous materials tags
Mar 9, 2016
858fd1c
Improved route type handling:
Mar 16, 2016
5ac5269
Convert landuse
Mar 21, 2016
54946f4
- further route type improvement
Apr 18, 2016
cbf78a2
- further route type improvement
Apr 18, 2016
10be889
Marking settlements as 'landuse=residential'
Apr 19, 2016
aff6b09
Add railroads
Nov 8, 2016
66d8f3a
Exceptional handling for Swedens BK Roads (Bärighetsklass)
Jan 30, 2017
cbbd051
Exceptional handling for Swedens BK Roads (Bärighetsklass)
Jan 30, 2017
b1b57b5
- added tags to country capitals
Aug 22, 2017
e521dd2
access-tagging: differ between hgv=no and hgv=delivery
Sep 18, 2017
985d593
Dec 18, 2017
781a0d5
Merge remote-tracking branch 'origin/wip2'
PhilHa Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ OSMPBF_LIBRARY=-losmpbf
endif

INCLUDES=${OSMIUM_INCLUDE} -Iplugins ${OSMPBF_INCLUDE}
LIBS=-lbz2 -lgdal -lexpat -lgeos -lpthread -lz -lprotobuf-lite -lboost_system -lboost_filesystem ${OSMPBF_LIBRARY}
LIBS=-lbz2 -lgdal -lexpat -lgeos -lpthread -lz -lprotobuf-lite -lboost_system -lboost_filesystem -licuuc ${OSMPBF_LIBRARY}

CXXFLAGS=-std=c++11
DEBUG_FLAGS=-O0 -g
Expand Down
4 changes: 4 additions & 0 deletions plugins/navteq/ISO-639-2_utf-8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ hit|||Hittite|hittite
hmn|||Hmong; Mong|hmong
hmo||ho|Hiri Motu|hiri motu
hrv||hr|Croatian|croate
scr||hr|Croatian|croate
hsb|||Upper Sorbian|haut-sorabe
hun||hu|Hungarian|hongrois
hup|||Hupa|hupa
Expand Down Expand Up @@ -283,9 +284,11 @@ mkh|||Mon-Khmer languages|môn-khmer, langues
mlg||mg|Malagasy|malgache
mlt||mt|Maltese|maltais
mnc|||Manchu|mandchou
mne||me|Montenegrin|monténégrin
mni|||Manipuri|manipuri
mno|||Manobo languages|manobo, langues
moh|||Mohawk|mohawk
mol||mo|Moldavian; Moldavan|moldave
mon||mn|Mongolian|mongol
mos|||Mossi|moré
mul|||Multiple languages|multilingue
Expand Down Expand Up @@ -401,6 +404,7 @@ sot||st|Sotho, Southern|sotho du Sud
spa||es|Spanish; Castilian|espagnol; castillan
srd||sc|Sardinian|sarde
srn|||Sranan Tongo|sranan tongo
srb||sr|Serbian|serbe
srp||sr|Serbian|serbe
srr|||Serer|sérère
ssa|||Nilo-Saharan languages|nilo-sahariennes, langues
Expand Down
751 changes: 689 additions & 62 deletions plugins/navteq/navteq.hpp
View file
Open in desktop

Large diffs are not rendered by default.

Loading