Skip to content

Commit

Permalink
Finish 1611
Browse files Browse the repository at this point in the history
  • Loading branch information
@keenonkites
keenonkites committed Nov 20, 2016
2 parents bf855c1 + dca02c5 commit d3aff35
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 30 deletions.
23 changes: 19 additions & 4 deletions Freizeitkarte-Entwicklung/mt.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@
'ele20' => "http://develop.freizeitkarte-osm.de/ele_20_100_500",
# 'ele25' => "http://develop.freizeitkarte-osm.de/ele_25_250_500",
);
my %hqelevationbaseurl = (
'ele10' => "http://develop.freizeitkarte-osm.de/ele_special/ele_10_100_200",
'ele20' => "http://develop.freizeitkarte-osm.de/ele_special/ele_20_100_500",
);

# Define the download URLS for the Boundaries (based on www.navmaps.eu/boundaries)
my @boundariesurl = (
Expand Down Expand Up @@ -358,7 +362,7 @@
my $LANGCODE = 0;
my $LANGDESC = 1;

my $VERSION = '1.3.12 - 2016/03/11';
my $VERSION = '1.3.13 - 2016/11/11';

# Maximale Speichernutzung (Heapsize im MB) beim Splitten und Compilieren
my $javaheapsize = 1536;
Expand Down Expand Up @@ -404,6 +408,7 @@
my $ram = $EMPTY;
my $cores = 2;
my $ele = 20;
my $hqele = $EMPTY;
my $clm = 1; # eventually unused ?
my $typfile = $EMPTY;
my $styledir = $EMPTY;
Expand Down Expand Up @@ -444,7 +449,7 @@


# get the command line parameters
if ( ! GetOptions ( 'h|?|help' => \$help, 'o|optional' => \$optional, 'u|unicode' => \$unicode, 'downloadbar' => \$downloadbar, 'continuedownload' => \$continuedownload, 'ram=s' => \$ram, 'cores=s' => \$cores, 'ele=s' => \$ele, 'typfile=s' => \$typfile, 'style=s' => \$styledir, 'language=s' => \$language, 'ntl=s' => \$nametaglist ) ) {
if ( ! GetOptions ( 'h|?|help' => \$help, 'o|optional' => \$optional, 'u|unicode' => \$unicode, 'downloadbar' => \$downloadbar, 'continuedownload' => \$continuedownload, 'ram=s' => \$ram, 'cores=s' => \$cores, 'ele=s' => \$ele, 'hqele' => \$hqele, 'typfile=s' => \$typfile, 'style=s' => \$styledir, 'language=s' => \$language, 'ntl=s' => \$nametaglist ) ) {
printf { *STDOUT } ( "ERROR:\n Unknown option.\n\n\n" );
show_usage ();
exit(1);
Expand Down Expand Up @@ -1202,10 +1207,20 @@ sub fetch_eledata {
# Download-URL
my $eleurl = '';
if ( $ele == 10 ) {
$eleurl = "$elevationbaseurl{ele10}/Hoehendaten_$mapname.osm.pbf";
if ( $hqele ) {
$eleurl = "$hqelevationbaseurl{ele10}/Hoehendaten_$mapname.osm.pbf";
}
else {
$eleurl = "$elevationbaseurl{ele10}/Hoehendaten_$mapname.osm.pbf";
}
}
elsif ( $ele == 20 ) {
$eleurl = "$elevationbaseurl{ele20}/Hoehendaten_$mapname.osm.pbf";
if ( $hqele ) {
$eleurl = "$hqelevationbaseurl{ele20}/Hoehendaten_$mapname.osm.pbf";
}
else {
$eleurl = "$elevationbaseurl{ele20}/Hoehendaten_$mapname.osm.pbf";
}
}
else {
# Default = 25 Meter
Expand Down
13 changes: 7 additions & 6 deletions Freizeitkarte-Entwicklung/style/fzk/lines-master
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
# Version : 0.32 29.11.2015 - Handling highway = primary & motorroad = yes same way as trunk for low resolutions (18-19)
# - Excluded railway=abandoned from display
# Version : 0.33 25.04.2016 - Showing aerialway = rope-tow also
# Version : 0.34 11.11.2016 - Fixing issue with highway=path and foot=designated wrongly classified as radfussweg



Expand Down Expand Up @@ -653,9 +654,9 @@ auto != * & highway = * {set auto = no}
# Duerfen hier Fahrraeder fahren?
# -------------------------------

highway = * & access != * & bicycle != * & vehicle != * {add fahrrad = yes}
highway = * & bicycle = no {add fahrrad = no}
highway = * & bicycle = yes {set fahrrad = yes}
highway = * & access != * & bicycle != * & vehicle != * & bfdesignated != * {add fahrrad = yes}
highway = * & bicycle = no {add fahrrad = no}
highway = * & bicycle = yes {set fahrrad = yes}

fahrrad != * & highway = * & vehicle = no {set fahrrad = no}
fahrrad != * & highway = * & vehicle = yes {set fahrrad = yes}
Expand All @@ -668,9 +669,9 @@ fahrrad != * & highway = * {set fahrrad = no}
# Darf man hier als Fussgaenger laufen?
# -------------------------------------

highway = * & access != * & foot != * {add fuss = yes}
highway = * & foot = no {add fuss = no}
highway = * & foot = yes {set fuss = yes}
highway = * & access != * & foot != * & bfdesignated != * {add fuss = yes}
highway = * & foot = no {add fuss = no}
highway = * & foot = yes {set fuss = yes}

fuss != * & highway = * & access = no {set fuss = no}
fuss != * & highway = * & access = yes {set fuss = yes}
Expand Down
45 changes: 25 additions & 20 deletions Freizeitkarte-Entwicklung/style/swisspopo/lines-master
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@
# Version : 0.29 01.03.2015 - Showning some less important rails later with a different pattern style ( service = *, railway = disused, usage = industrial)
# : 0.30 01.05.2015 - Changes regarding highway = track and tracktype = grade*: don't show as unspecified road if cars allowed
# 0.31 30.05.2015 - Changes regarding bridges on highways and railways (different types): bridge can have other values than only 'yes'
# Version : 0.32 25.04.2016 - Showing aerialway = rope-tow also

# Version : 0.32 29.11.2015 - Handling highway = primary & motorroad = yes same way as trunk for low resolutions (18-19)
# - Excluded railway=abandoned from display
# Version : 0.33 25.04.2016 - Showing aerialway = rope-tow also
# Version : 0.34 11.11.2016 - Fixing issue with highway=path and foot=designated wrongly classified as radfussweg


#
Expand Down Expand Up @@ -656,9 +658,9 @@ auto != * & highway = * {set auto = no}
# Duerfen hier Fahrraeder fahren?
# -------------------------------

highway = * & access != * & bicycle != * & vehicle != * {add fahrrad = yes}
highway = * & bicycle = no {add fahrrad = no}
highway = * & bicycle = yes {set fahrrad = yes}
highway = * & access != * & bicycle != * & vehicle != * & bfdesignated != * {add fahrrad = yes}
highway = * & bicycle = no {add fahrrad = no}
highway = * & bicycle = yes {set fahrrad = yes}

fahrrad != * & highway = * & vehicle = no {set fahrrad = no}
fahrrad != * & highway = * & vehicle = yes {set fahrrad = yes}
Expand All @@ -671,9 +673,9 @@ fahrrad != * & highway = * {set fahrrad = no}
# Darf man hier als Fussgaenger laufen?
# -------------------------------------

highway = * & access != * & foot != * {add fuss = yes}
highway = * & foot = no {add fuss = no}
highway = * & foot = yes {set fuss = yes}
highway = * & access != * & foot != * & bfdesignated != * {add fuss = yes}
highway = * & foot = no {add fuss = no}
highway = * & foot = yes {set fuss = yes}

fuss != * & highway = * & access = no {set fuss = no}
fuss != * & highway = * & access = yes {set fuss = yes}
Expand Down Expand Up @@ -923,11 +925,12 @@ highway = primary & man_made = dyke [0x011f03 resolution 24 continue
# 0x012101 = 4/1 (breit, Label, SmallFont)
# 0x010f0e = 2/1 (mittel, NoLabel)
# 0x010f0f = 1/1 (schmal, NoLabel)
highway = primary {set name = '${name}' | '${ref}' | ''} [0x011f15 resolution 24 continue with_actions]
highway = primary {set name = '${name}' | '${ref}' | ''} [0x012101 resolution 23-23 continue with_actions]
highway = primary {set name = '${ref}' | ''} [0x010f0e resolution 22-22 continue with_actions]
highway = primary {set name = '${ref}' | ''} [0x010f0f resolution 20-21]

# 0x010e0b = 1 (sehr schmal, NoLabel)
highway = primary {set name = '${name}' | '${ref}' | ''} [0x011f15 resolution 24 continue with_actions]
highway = primary {set name = '${name}' | '${ref}' | ''} [0x012101 resolution 23-23 continue with_actions]
highway = primary {set name = '${ref}' | ''} [0x010f0e resolution 22-22 continue with_actions]
highway = primary {set name = '${ref}' | ''} [0x010f0f resolution 20-21 continue with_actions]
highway = primary & motorroad = yes {set name = '${ref}' | ''} [0x010e0b resolution 18-19]

# Land- oder sehr gut ausgebaute Kreisstrasse:
# --------------------------------------------
Expand Down Expand Up @@ -1760,11 +1763,13 @@ railway = funicular {set railway = rail}
# 2. Die Schienen und der Schotter werden entfernt, aber ansonsten bleibt das Gelaende unveraendert (railway=abandoned).
# 3. Das Gelaende wird fuer eine neue Nutzung umgebaut (taggen der neuen Nutzung).
# Zwischen den einzelnen Phasen liegen durchaus mehrere Jahre.
# 0x012102 = Bitmap 2 (NoLabel)
railway = abandoned & bridge = * & bridge != no [0x010407 resolution 24 continue]
railway = abandoned & tunnel = yes [0x010408 resolution 24 continue]

# Abondoned: disabled 2015-11-29
#railway = abandoned & bridge = * & bridge != no [0x010407 resolution 24 continue]
#railway = abandoned & tunnel = yes [0x010408 resolution 24 continue]
### railway = abandoned & embankment = yes [0x011f05 resolution 24 continue]
railway = abandoned [0x012102 resolution 24]
# 0x012102 = Bitmap 2 (NoLabel)
#railway = abandoned [0x012102 resolution 24]

# Der Bahnsteig verlaeuft parallel zu den Gleisen. [point, way, closedway]
# 0x010e1d = 2 (NoLabel)
Expand All @@ -1778,12 +1783,12 @@ railway = rail & service = * & bridge = * & bridge != no [0x010407 resolution 2
railway = rail & service = * & tunnel = yes [0x012109 resolution 23]
railway = rail & service = * [0x012113 resolution 23]

# Eisenbahn, auch S-Bahn (kann auch teilweise unterirdisch verkehren).
# Eisenbahn, auch S-Bahn: disused
# 0x012109 = Bitmap 2 (NoLabel)
# 0x012113 = Bitmap 2 (NoLabel)
railway = disused & bridge = * & bridge != no [0x010407 resolution 24 continue]
railway = disused & tunnel = yes [0x012109 resolution 22]
railway = disused [0x012113 resolution 22]
railway = disused & tunnel = yes [0x012109 resolution 24]
railway = disused [0x012113 resolution 24]

# Eisenbahn, auch S-Bahn (kann auch teilweise unterirdisch verkehren).
# 0x012109 = Bitmap 2 (NoLabel)
Expand Down

0 comments on commit d3aff35

Please sign in to comment.