Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
44d190c
style: Create copy of fzk style for fenix
cryptomilk Jun 23, 2020
4ea8367
fenix:style: Remove powerlines
cryptomilk Jun 23, 2020
afc3bc0
fenix:style: Reduce number of points we don't need on fitness trackers
cryptomilk Jun 23, 2020
8bff834
fenix:typ: Copy outdoorc to fenix
cryptomilk Jun 23, 2020
46055ba
fenix:typ: Improve contrast for fenix devices
cryptomilk Jun 23, 2020
f1b3389
fenix:typ: Fix displaying of forest areas on fenix 6
cryptomilk Jun 23, 2020
bb7aa86
fenix:typ: Increase peak size
cryptomilk Jun 23, 2020
d0bbde9
fenix:typ: Use better icon for parking lots
cryptomilk Jun 25, 2020
421c152
fenix:typ: Create nicer icon for (bus) stops
cryptomilk Jun 25, 2020
8f7db63
fenix:style: Remove private parking lots
cryptomilk Jun 25, 2020
5dc2ba6
fenix:style: Use less details for zoom levels
cryptomilk Jun 23, 2020
6458ce4
fenix:typ: Add nicer restaurant icon
cryptomilk Jun 25, 2020
b008d70
fenix:typ: Use a nicer icon for a cafe
cryptomilk Jun 25, 2020
fdabd42
fenix:typ: Add better icon for shopping
cryptomilk Jun 25, 2020
8d60c25
fenix:typ: Add a nicer icon for pharmacy
cryptomilk Jun 25, 2020
cd8895e
fenix:typ: Improve icon for hospital
cryptomilk Jun 29, 2020
86dbf97
fenix:typ: Improve contrast for residual/industrial/buildings
cryptomilk Jun 29, 2020
ed61764
fenix:typ: Improve cycle and foot path
cryptomilk Jun 29, 2020
07823b6
fenix:typ: Improve border contrast of residential streets
cryptomilk Jul 2, 2020
019efb1
fenix:typ: Make hospital background reddish
cryptomilk Jul 2, 2020
39f5c57
fenix:typ: Use better contrast for school backgrounds
cryptomilk Jul 2, 2020
c20b826
typ:fenix: Improve some contrast for areas
cryptomilk Jul 15, 2020
c0c8106
fenix:typ: Tune greens
cryptomilk Nov 9, 2021
e20d6ff
fzk:style: Tune MTB tracks
cryptomilk Nov 9, 2021
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
9,526 changes: 9,526 additions & 0 deletions Freizeitkarte-Entwicklung/TYP/fenix.txt

Large diffs are not rendered by default.

125 changes: 125 additions & 0 deletions Freizeitkarte-Entwicklung/style/fzk-fenix/compat_lines
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
include 'roadspeed';

name=* { name '${name}' }
mkgmap:default_name=* { name '${mkgmap:default_name}' }
mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }

mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }

ref=* { addlabel '${ref|part:;:1}'; addlabel '${ref|part:;:2}'; addlabel '${ref|part:;:3}' }
int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }

highway=* & mkgmap:label:1=* & mkgmap:street!=* { add mkgmap:street='${mkgmap:label:1}' }

toll=* { set mkgmap:toll='${toll}' }

# new AccessMapping("access", RoadNetwork.NO_MAX), // must be first in list
# new AccessMapping("bicycle", RoadNetwork.NO_BIKE),
# new AccessMapping("carpool", RoadNetwork.NO_CARPOOL),
# new AccessMapping("foot", RoadNetwork.NO_FOOT),
# new AccessMapping("hgv", RoadNetwork.NO_TRUCK),
# new AccessMapping("motorcar", RoadNetwork.NO_CAR),
# new AccessMapping("motorcycle", RoadNetwork.NO_CAR),
# new AccessMapping("psv", RoadNetwork.NO_BUS),
# new AccessMapping("taxi", RoadNetwork.NO_TAXI),
# new AccessMapping("emergency", RoadNetwork.NO_EMERGENCY),
# new AccessMapping("delivery", RoadNetwork.NO_DELIVERY),
# new AccessMapping("goods", RoadNetwork.NO_DELIVERY),
# for (AccessMapping anAccessMap : accessMap) {
# int index = anAccessMap.index;
# String type = anAccessMap.type;
# String accessTagValue = way.getTag(type);
# if (accessTagValue == null)
# continue;
# if (accessExplicitlyDenied(accessTagValue)) {
# if (index == RoadNetwork.NO_MAX) {
# // everything is denied access
# for (int j = 1; j < accessMap.length; ++j)
# noAccess[accessMap[j].index] = true;
# } else {
# // just the specific vehicle class is denied
# // access
# noAccess[index] = true;
# }
# log.debug(type + " is not allowed in " + highwayType + " " + debugWayName);
# } else if (accessExplicitlyAllowed(accessTagValue)) {
# if (index == RoadNetwork.NO_MAX) {
# // everything is allowed access
# for (int j = 1; j < accessMap.length; ++j)
# noAccess[accessMap[j].index] = false;
# } else {
# // just the specific vehicle class is allowed
# // access
# noAccess[index] = false;
# }
# log.debug(type + " is allowed in " + highwayType + " " + debugWayName);
# }
# else if (accessTagValue.equalsIgnoreCase("destination")) {
# if (type.equals("motorcar") ||
# type.equals("motorcycle")) {
# road.setNoThroughRouting();
# } else if (type.equals("access")) {
# log.info("access=destination only affects routing for cars in " + highwayType + " " + debugWayName);
# road.setNoThroughRouting();
# } else {
# log.info(type + "=destination ignored in " + highwayType + " " + debugWayName);
# }
# } else if (accessTagValue.equalsIgnoreCase("unknown")) {
# // implicitly allow access
# } else {
# log.info("Ignoring unsupported access tag value " + type + "=" + accessTagValue + " in " + highwayType + " " + debugWayName);
# }
# }
#

# mkgmap:carpool tag is set but before new access handling was introduced it had a
# different meaning. Copy it to keep its value which is handled in the old behaviour last.
mkgmap:carpool=* { set mkgmap:carpool_compat='${mkgmap:carpool}'; delete mkgmap:carpool }

access=private | access=no { setaccess no; set mkgmap:carpool=yes; }
access=yes | access=permissive | access=official | access=designated { setaccess yes; set mkgmap:carpool=no; }
access=destination { set mkgmap:throughroute=no }

bicycle=private | bicycle=no { set mkgmap:bicycle=no; }
bicycle=yes | bicycle=permissive | bicycle=official | bicycle=designated { set mkgmap:bicycle=yes; }

carpool=private | carpool=no { set mkgmap:carpool=no; }
carpool=yes | carpool=permissive | carpool=official | carpool=designated { set mkgmap:carpool=yes; }

foot=private | foot=no { set mkgmap:foot=no; }
foot=yes | foot=permissive | foot=official | foot=designated { set mkgmap:foot=yes; }

hgv=private | hgv=no { set mkgmap:truck=no; }
hgv=yes | hgv=permissive | hgv=official | hgv=designated { set mkgmap:truck=yes; }

motorcar=private | motorcar=no { set mkgmap:car=no; }
motorcar=yes | motorcar=permissive | motorcar=official | motorcar=designated { set mkgmap:car=yes; }
motorcar=destination { set mkgmap:throughroute=no }

motorcycle=private | motorcycle=no { set mkgmap:car=no; }
motorcycle=yes | motorcycle=permissive | motorcycle=official | motorcycle=designated { set mkgmap:car=yes; }
motorcycle=destination { set mkgmap:throughroute=no }

psv=private | psv=no { set mkgmap:bus=no; }
psv=yes | psv=permissive | psv=official | psv=designated { set mkgmap:bus=yes; }

taxi=private | taxi=no { set mkgmap:taxi=no; }
taxi=yes | taxi=permissive | taxi=official | taxi=designated { set mkgmap:taxi=yes; }

emergency=private | emergency=no { set mkgmap:emergency=no; }
emergency=yes | emergency=permissive | emergency=official | emergency=designated { set mkgmap:emergency=yes; }

delivery=private | delivery=no { set mkgmap:delivery=no; }
delivery=yes | delivery=permissive | delivery=official | delivery=designated { set mkgmap:delivery=yes; }

goods=private | goods=no { set mkgmap:delivery=no; }
goods=yes | goods=permissive | goods=official | goods=designated { set mkgmap:delivery=yes; }

# Reintroduce the old carpool handling which allows access only for bus and emergency plus setting the carpool bit
mkgmap:carpool_compat=yes { setaccess no; set mkgmap:bus=yes; set mkgmap:emergency=yes; set mkgmap:carpool=yes }

13 changes: 13 additions & 0 deletions Freizeitkarte-Entwicklung/style/fzk-fenix/compat_points
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name=* { name '${name}' }
mkgmap:default_name=* { name '${mkgmap:default_name}' }
mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }

mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }

ref=* { addlabel '${ref|part:;:1}'; addlabel '${ref|part:;:2}'; addlabel '${ref|part:;:3}' }
int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }
13 changes: 13 additions & 0 deletions Freizeitkarte-Entwicklung/style/fzk-fenix/compat_polygons
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name=* { name '${name}' }
mkgmap:default_name=* { name '${mkgmap:default_name}' }
mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }

mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }

ref=* { addlabel '${ref|part:;:1}'; addlabel '${ref|part:;:2}'; addlabel '${ref|part:;:3}' }
int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }
109 changes: 109 additions & 0 deletions Freizeitkarte-Entwicklung/style/fzk-fenix/indexsearch-master
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# Stand: 2014/5/05
# -----------------
# Version : 0.01 - 26.08.2012: Basic functionalities
# Version : 0.02 - 05.05.2014: Adapted Details about AUT: there was something different to the default style files provided with new mkgmap version

# first set the country code
mkgmap:country!=* & mkgmap:admin_level2=* { set mkgmap:country='${mkgmap:admin_level2}' }
mkgmap:country!=* & addr:country=* { set mkgmap:country='${addr:country}' }
mkgmap:country!=* & is_in:country=* { set mkgmap:country='${is_in:country}' }

# country specific rules first

# Netherlands = NLD
mkgmap:country=NLD & mkgmap:region!=* & mkgmap:admin_level4=* { set mkgmap:region='${mkgmap:admin_level4}' }
mkgmap:country=NLD & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
mkgmap:country=NLD & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }

# Germany = DEU cities (Wichtig: Die Abarbeitungsreihenfolge (von oben nach unten) ist relevant.)

# Hamburg (Sonderfall):
# Die Bezeichnung "Hamburg" gibt es nur im "admin_level=4".
# Im "admin_level=9" gibt es "Hamburg-Mitte" und "Hamburg-Nord".
# Für die Adresssuche wird deshalb das "admin_level=4" verwendet.
mkgmap:country=DEU & mkgmap:admin_level4=Hamburg {set mkgmap:city='${mkgmap:admin_level4}' }

# Berlin (Sonderfall):
# Die Bezeichnung "Berlin" gibt es nur im "admin_level=4".
mkgmap:country=DEU & mkgmap:admin_level4=Berlin {set mkgmap:city='${mkgmap:admin_level4}' }

# Bremen (kein Sonderfall):
# Im "admin_level=4" gibt es die Bezeichnung "Freie Hansestadt Bremen (Landmasse)".
# Im "admin_level=6" gibt es die Bezeichnungen "Bremen".
# Nachfolgend greift die Regel für "admin_level=6".

# Diverse Verwaltungseinheiten im "admin_level 8" tragen ein Bezeichnungspräfix.
# Am häufigsten in Deutschland kommen folgende Präfixe vor (Stand 12/2011):
# - "Gemeinde " (658x, Beispiele: "Gemeinde Spalt", "Gemeinde Maxdorf")
# - "Bad " (135x, Beispiele: "Bad Brambach", "Bad Ems")
# - "Stadt " (67x, Beispiele: "Stadt Linz am Rhein", "Stadt Rodgau")
# - "Groß " (46x, Beispiele: "Groß Dratow", "Groß Wittensee")
# - "Gemeindefreies " (29x, Beispiele: "Gemeindefreies Gebiet Harz", "Gemeindefreies Gebiet Soos")
# - "Klein " (25x, Beispiele: "Klein Luckow", "Klein Vielen")
# - "Sankt " (25x, Beispiele: "Sankt Goarshausen", "Sankt Peter-Ording")
# Die Präfixe "Gemeinde " und "Stadt " stellen keinen Namensbestandteil dar und werden entfernt.

# Rostock (Sonderfall):
### mkgmap:country=DEU & mkgmap:admin_level6=Rostock {set mkgmap:city='${mkgmap:admin_level6}' }

mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8|subst:Gemeinde |subst:Stadt }' }
### ohne admin_level 7 (Verbandsgemeinden, Verwaltungsgemeinschaften, etc.)
### mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level6=* { set mkgmap:city='${mkgmap:admin_level6}' }
mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }

# Österreich = AUT
# Das Präfix "Gemeinde " stellt keinen Namensbestandteil dar und wird entfernt.
mkgmap:country=AUT & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10|subst:Gemeinde |subst:Stadt }' }
mkgmap:country=AUT & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8|subst:Gemeinde }' }

mkgmap:country=BEL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=CZE & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=CZE & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
mkgmap:country=DNK & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=DNK & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
mkgmap:country=FIN & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=FIN & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=FRA & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=FRA & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=ISL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=ITA & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=LUX & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=NOR & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=POL & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
mkgmap:country=POL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=PRT & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=PRT & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=SVN & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
mkgmap:country=ESP & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:country=SWE & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:country=SWE & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
mkgmap:country=CHE & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }

# common rules for all the rest of countries
mkgmap:region!=* & mkgmap:admin_level6=* { set mkgmap:region='${mkgmap:admin_level6}' }
mkgmap:region!=* & mkgmap:admin_level5=* { set mkgmap:region='${mkgmap:admin_level5}' }
mkgmap:region!=* & mkgmap:admin_level4=* { set mkgmap:region='${mkgmap:admin_level4}' }
mkgmap:region!=* & mkgmap:admin_level3=* { set mkgmap:region='${mkgmap:admin_level3}' }
mkgmap:region!=* & is_in:county=* { set mkgmap:region='${is_in:county}' }

mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
mkgmap:city!=* & is_in:city=* { set mkgmap:city='${is_in:city}' }
mkgmap:city!=* & addr:city=* { set mkgmap:city='${addr:city}' }

mkgmap:postal_code!=* & mkgmap:postcode=* { set mkgmap:postal_code='${mkgmap:postcode}' }
mkgmap:postal_code!=* & addr:postcode=* { set mkgmap:postal_code='${addr:postcode}' }

mkgmap:street!=* & addr:street=* { set mkgmap:street='${addr:street}' }
mkgmap:street!=* & addr:housename=* { set mkgmap:street='${addr:housename}' }

mkgmap:housenumber!=* & addr:housenumber=* { set mkgmap:housenumber='${addr:housenumber}' }

mkgmap:phone!=* & phone=* { set mkgmap:phone='${phone}' }
mkgmap:phone!=* & contact:phone=* { add mkgmap:phone='${contact:phone}' }

mkgmap:is_in!=* & is_in=* { set mkgmap:is_in='${is_in}' }
18 changes: 18 additions & 0 deletions Freizeitkarte-Entwicklung/style/fzk-fenix/info-master
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# ---------------------------------------
# Zweck : Informationen bezüglich des Regelsatzes.
# Version : 0.1 - 23.09.2011
#
# Copyright (C) 2011 Klaus Tockloth <freizeitkarte@googlemail.com>
# ---------------------------------------

# A short one line description of the Style:
summary: Freizeitkarte (angelehnt an das Mapnik-Design)

# Version of the Style itself:
version=1.0

# A longer description of the Style:
description {
Dieser Regelsatz beruecksichtigt Informationen die primaer fuer eine Freizeitkarte relevant sind.
}

Loading