Skip to content

Feature/no elevation #27

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

Open
spresso wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Feature/no elevation #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4d550c
Merge pull request #2 from freizeitkarte/develop
spresso May 29, 2019
24432a3
provide option to ignore elevation data
spresso May 26, 2019
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
16 changes: 13 additions & 3 deletions Freizeitkarte-Entwicklung/mt.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,11 @@ sub fetch_eledata {

# Download-URL
my $eleurl = '';
if ( $ele == 10 ) {
if ( $ele == 0 ) {
printf { *STDERR } ( "Skip loading of elevation data (--ele=0).\n\n" );
return;
}
elsif ( $ele == 10 ) {
if ( $hqele ) {
$eleurl = "$hqelevationbaseurl{ele10}/Hoehendaten_$mapname.osm.pbf";
}
Expand Down Expand Up @@ -1773,7 +1777,7 @@ sub join_mapdata {
}
}

if ( -e $filename_hoehendaten ) {
if ( ( -e $filename_hoehendaten ) && ($ele != 0) ) {
# check if the elevation data exists and has the proper format
if ( check_osmpbf ( $filename_hoehendaten ) ) {
$available_hoehendaten = 1;
Expand Down Expand Up @@ -1820,8 +1824,14 @@ sub join_mapdata {

}
elsif ( $available_kartendaten ) {
if ($ele == 0) {
# ignore elevation data
printf { *STDERR } ( "\nIgnore Elevation data.\n" );
}
else {
# only mapdata there, elevation stuff missing, but let's continue anyway
printf { *STDERR } ( "\nWarning: Elevation data file <$filename_hoehendaten> not found.\n" );
}
printf { *STDERR } ( "\nCopying map data ...\n" );

# so let's copy mapdata only
Expand Down Expand Up @@ -5844,7 +5854,7 @@ sub show_help {
. "Options:\n"
. "--ram = javaheapsize in MB (join, split, build) (default = %d)\n"
. "--cores = max. number of CPU cores (build) (1, 2, ..., max; default = %d)\n"
. "--ele = equidistance of elevation lines (fetch_ele) (10, 20; default = 20)\n"
. "--ele = equidistance of elevation lines (fetch_ele, join) (10, 20, 0; default = 20)\n"
. "--typfile = filename of a valid typfile to be used (build, gmap, nsis, gmapsupp, imagedir, typ) (default = freizeit.TYP)\n"
. "--style = name of the style to be used, must be a directory below styles (default = fzk)\n"
. "--language = overwrite the default language of a map (en=english, de=german);\n"
Expand Down