From 19d8fa84f6672207bd58e4991b70ecc6e7f56926 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 27 Apr 2026 20:55:16 +0200 Subject: [PATCH 1/3] make sea/waterway render as water --- prettymaps/presets/abraca-redencao.json | 12 +++ prettymaps/presets/barcelona.json | 95 ++++++++++++++++- prettymaps/presets/cb-bf-f.json | 12 +++ prettymaps/presets/heerhugowaard.json | 16 +++ prettymaps/presets/macao.json | 16 +++ prettymaps/presets/plotter.json | 79 +++++++++++++- prettymaps/presets/tijuca.json | 136 +++++++++++++++++++++++- 7 files changed, 363 insertions(+), 3 deletions(-) diff --git a/prettymaps/presets/abraca-redencao.json b/prettymaps/presets/abraca-redencao.json index c6739f7..9acf646 100644 --- a/prettymaps/presets/abraca-redencao.json +++ b/prettymaps/presets/abraca-redencao.json @@ -94,6 +94,18 @@ "lw": 1, "zorder": 3 }, + "sea": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "waterway": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, "school": { "fc": "#FCE19C", "ec": "#2F3737", diff --git a/prettymaps/presets/barcelona.json b/prettymaps/presets/barcelona.json index 34b8f15..471e5a2 100644 --- a/prettymaps/presets/barcelona.json +++ b/prettymaps/presets/barcelona.json @@ -1 +1,94 @@ -{"layers": {"perimeter": {"circle": false}, "streets": {"width": {"primary": 5, "secondary": 4, "tertiary": 3, "residential": 2, "footway": 1}}, "building": {"tags": {"building": true}}, "green": {"tags": {"landuse": ["grass", "village_green"], "leisure": "park"}}}, "style": {"background": {"fc": "#F2F4CB", "ec": "#dadbc1", "hatch": "ooo...", "zorder": -1}, "perimeter": {"fill": false, "lw": 0, "zorder": 0}, "green": {"fc": "#8BB174", "ec": "#2F3737", "hatch_c": "#A7C497", "hatch": "ooo...", "lw": 1, "zorder": 1}, "water": {"fc": "#a8e1e6", "ec": "#2F3737", "hatch_c": "#9bc3d4", "hatch": "ooo...", "lw": 1, "zorder": 3}, "streets": {"fc": "#2F3737", "ec": "#475657", "alpha": 1, "lw": 0, "zorder": 4}, "building": {"palette": ["#433633", "#FF5E5B"], "ec": "#2F3737", "lw": 0.5, "zorder": 5}}, "circle": null, "radius": 500, "dilate": 100} \ No newline at end of file +{ + "layers": { + "perimeter": { + "circle": false + }, + "streets": { + "width": { + "primary": 5, + "secondary": 4, + "tertiary": 3, + "residential": 2, + "footway": 1 + } + }, + "building": { + "tags": { + "building": true + } + }, + "green": { + "tags": { + "landuse": [ + "grass", + "village_green" + ], + "leisure": "park" + } + } + }, + "style": { + "background": { + "fc": "#F2F4CB", + "ec": "#dadbc1", + "hatch": "ooo...", + "zorder": -1 + }, + "perimeter": { + "fill": false, + "lw": 0, + "zorder": 0 + }, + "green": { + "fc": "#8BB174", + "ec": "#2F3737", + "hatch_c": "#A7C497", + "hatch": "ooo...", + "lw": 1, + "zorder": 1 + }, + "water": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "sea": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "waterway": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "streets": { + "fc": "#2F3737", + "ec": "#475657", + "alpha": 1, + "lw": 0, + "zorder": 4 + }, + "building": { + "palette": [ + "#433633", + "#FF5E5B" + ], + "ec": "#2F3737", + "lw": 0.5, + "zorder": 5 + } + }, + "circle": null, + "radius": 500, + "dilate": 100 +} diff --git a/prettymaps/presets/cb-bf-f.json b/prettymaps/presets/cb-bf-f.json index b95d2c6..587b907 100644 --- a/prettymaps/presets/cb-bf-f.json +++ b/prettymaps/presets/cb-bf-f.json @@ -71,6 +71,18 @@ "lw": 1, "zorder": 2 }, + "sea": { + "fc": "#92D5F2", + "ec": "#6da8c2", + "lw": 1, + "zorder": 2 + }, + "waterway": { + "fc": "#92D5F2", + "ec": "#6da8c2", + "lw": 1, + "zorder": 2 + }, "streets": { "fc": "#F1E6D0", "ec": "#2F3737", diff --git a/prettymaps/presets/heerhugowaard.json b/prettymaps/presets/heerhugowaard.json index df71591..7c8dd5b 100644 --- a/prettymaps/presets/heerhugowaard.json +++ b/prettymaps/presets/heerhugowaard.json @@ -93,6 +93,22 @@ "lw": 1, "zorder": 3 }, + "sea": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "waterway": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, "beach": { "fc": "#FCE19C", "ec": "#2F3737", diff --git a/prettymaps/presets/macao.json b/prettymaps/presets/macao.json index 98d6c3e..da43e0d 100644 --- a/prettymaps/presets/macao.json +++ b/prettymaps/presets/macao.json @@ -88,6 +88,22 @@ "lw": 1, "zorder": 2 }, + "sea": { + "fc": "#a1e3ff", + "ec": "#2F3737", + "hatch": "ooo...", + "hatch_c": "#85c9e6", + "lw": 1, + "zorder": 2 + }, + "waterway": { + "fc": "#a1e3ff", + "ec": "#2F3737", + "hatch": "ooo...", + "hatch_c": "#85c9e6", + "lw": 1, + "zorder": 2 + }, "parking": { "fc": "#F2F4CB", "ec": "#2F3737", diff --git a/prettymaps/presets/plotter.json b/prettymaps/presets/plotter.json index d91e897..60fed37 100644 --- a/prettymaps/presets/plotter.json +++ b/prettymaps/presets/plotter.json @@ -1 +1,78 @@ -{"layers": {"perimeter": {}, "streets": {"width": {"motorway": 5, "trunk": 5, "primary": 4.5, "secondary": 4, "tertiary": 3.5, "cycleway": 3.5, "residential": 3, "service": 2, "unclassified": 2, "pedestrian": 2, "footway": 1}}, "building": {"tags": {"building": true, "landuse": "construction"}}, "water": {"tags": {"natural": ["water", "bay"]}}, "forest": {"tags": {"landuse": "forest"}}, "green": {"tags": {"landuse": ["grass", "orchard"], "natural": ["island", "wood"], "leisure": "park"}}, "beach": {"tags": {"natural": "beach"}}, "parking": {"tags": {"amenity": "parking", "highway": "pedestrian", "man_made": "pier"}}}, "style": {"perimeter": {}, "background": {}, "green": {}, "forest": {}, "water": {}, "beach": {}, "parking": {}, "streets": {}, "building": {}}, "circle": null, "radius": false, "dilate": null} \ No newline at end of file +{ + "layers": { + "perimeter": {}, + "streets": { + "width": { + "motorway": 5, + "trunk": 5, + "primary": 4.5, + "secondary": 4, + "tertiary": 3.5, + "cycleway": 3.5, + "residential": 3, + "service": 2, + "unclassified": 2, + "pedestrian": 2, + "footway": 1 + } + }, + "building": { + "tags": { + "building": true, + "landuse": "construction" + } + }, + "water": { + "tags": { + "natural": [ + "water", + "bay" + ] + } + }, + "forest": { + "tags": { + "landuse": "forest" + } + }, + "green": { + "tags": { + "landuse": [ + "grass", + "orchard" + ], + "natural": [ + "island", + "wood" + ], + "leisure": "park" + } + }, + "beach": { + "tags": { + "natural": "beach" + } + }, + "parking": { + "tags": { + "amenity": "parking", + "highway": "pedestrian", + "man_made": "pier" + } + } + }, + "style": { + "perimeter": {}, + "background": {}, + "green": {}, + "forest": {}, + "water": {}, + "beach": {}, + "parking": {}, + "streets": {}, + "building": {} + }, + "circle": null, + "radius": false, + "dilate": null +} diff --git a/prettymaps/presets/tijuca.json b/prettymaps/presets/tijuca.json index 051bbe9..fbbb49e 100644 --- a/prettymaps/presets/tijuca.json +++ b/prettymaps/presets/tijuca.json @@ -1 +1,135 @@ -{"layers": {"perimeter": {}, "streets": {"width": {"motorway": 12, "trunk": 12, "primary": 11, "secondary": 10, "tertiary": 9, "residential": 8}}, "park": {"tags": {"leisure": "nature_reserve", "landuse": "military", "boundary": "protected_area", "place": "square", "natural": "grassland", "amenity": "hospital"}}, "grass": {"tags": {"landuse": "grass", "natural": "wood"}}, "wetland": {"tags": {"natural": "scrub"}}, "beach": {"tags": {"natural": "beach"}}, "water": {"tags": {"natural": "water"}}, "pedestrian": {"tags": {"area:highway": "pedestrian"}}, "building": {"tags": {"building": true}}}, "style": {"perimeter": {"ec": "#0F110C", "fill": false, "lw": 0}, "park": {"fc": "#AAD897", "ec": "#8bc49e", "lw": 0, "zorder": 1, "hatch": "ooo..."}, "grass": {"fc": "#72C07A", "ec": "#64a38d", "lw": 0, "zorder": 1, "hatch": "ooo..."}, "wetland": {"fc": "#D2D68D", "ec": "#AEB441", "lw": 0, "zorder": 3, "hatch": "ooo..."}, "water": {"fc": "#6CCFF6", "ec": "#59adcf", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "beach": {"fc": "#F2E3BC", "ec": "#EBD499", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "pedestrian": {"fc": "#7BC950", "ec": "#638475", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "streets": {"fc": "#898989", "ec": "#706f6f", "zorder": 3, "lw": 0, "hatch": "ooo..."}, "building": {"fc": "#E7A89C", "ec": "#E7A89C", "lw": 0, "zorder": 0}}, "circle": null, "radius": null, "dilate": 0} \ No newline at end of file +{ + "layers": { + "perimeter": {}, + "streets": { + "width": { + "motorway": 12, + "trunk": 12, + "primary": 11, + "secondary": 10, + "tertiary": 9, + "residential": 8 + } + }, + "park": { + "tags": { + "leisure": "nature_reserve", + "landuse": "military", + "boundary": "protected_area", + "place": "square", + "natural": "grassland", + "amenity": "hospital" + } + }, + "grass": { + "tags": { + "landuse": "grass", + "natural": "wood" + } + }, + "wetland": { + "tags": { + "natural": "scrub" + } + }, + "beach": { + "tags": { + "natural": "beach" + } + }, + "water": { + "tags": { + "natural": "water" + } + }, + "pedestrian": { + "tags": { + "area:highway": "pedestrian" + } + }, + "building": { + "tags": { + "building": true + } + } + }, + "style": { + "perimeter": { + "ec": "#0F110C", + "fill": false, + "lw": 0 + }, + "park": { + "fc": "#AAD897", + "ec": "#8bc49e", + "lw": 0, + "zorder": 1, + "hatch": "ooo..." + }, + "grass": { + "fc": "#72C07A", + "ec": "#64a38d", + "lw": 0, + "zorder": 1, + "hatch": "ooo..." + }, + "wetland": { + "fc": "#D2D68D", + "ec": "#AEB441", + "lw": 0, + "zorder": 3, + "hatch": "ooo..." + }, + "water": { + "fc": "#6CCFF6", + "ec": "#59adcf", + "lw": 0, + "zorder": 2, + "hatch": "ooo..." + }, + "sea": { + "fc": "#6CCFF6", + "ec": "#59adcf", + "lw": 0, + "zorder": 2, + "hatch": "ooo..." + }, + "waterway": { + "fc": "#6CCFF6", + "ec": "#59adcf", + "lw": 0, + "zorder": 2, + "hatch": "ooo..." + }, + "beach": { + "fc": "#F2E3BC", + "ec": "#EBD499", + "lw": 0, + "zorder": 2, + "hatch": "ooo..." + }, + "pedestrian": { + "fc": "#7BC950", + "ec": "#638475", + "lw": 0, + "zorder": 2, + "hatch": "ooo..." + }, + "streets": { + "fc": "#898989", + "ec": "#706f6f", + "zorder": 3, + "lw": 0, + "hatch": "ooo..." + }, + "building": { + "fc": "#E7A89C", + "ec": "#E7A89C", + "lw": 0, + "zorder": 0 + } + }, + "circle": null, + "radius": null, + "dilate": 0 +} From f58754792cff3d382f9f4de8fcb4044c4f598d19 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Sat, 2 May 2026 20:34:50 +0200 Subject: [PATCH 2/3] further testing --- prettymaps/presets/barcelona.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/prettymaps/presets/barcelona.json b/prettymaps/presets/barcelona.json index 471e5a2..2a2ea0b 100644 --- a/prettymaps/presets/barcelona.json +++ b/prettymaps/presets/barcelona.json @@ -25,6 +25,27 @@ ], "leisure": "park" } + }, + "sea": {}, + "water": { + "tags": { + "natural": [ + "water", + "bay" + ] + } + }, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } } }, "style": { From f2a1dbe88ecf3d9e6df0f61b49435aff3c6954fe Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Sat, 2 May 2026 20:55:04 +0200 Subject: [PATCH 3/3] updates --- prettymaps/presets/abraca-redencao.json | 295 ++++++++++++----------- prettymaps/presets/cb-bf-f.json | 215 +++++++++-------- prettymaps/presets/heerhugowaard.json | 303 ++++++++++++------------ prettymaps/presets/macao.json | 275 +++++++++++---------- prettymaps/presets/minimal.json | 82 +++---- prettymaps/presets/plotter.json | 13 + prettymaps/presets/tijuca.json | 13 + 7 files changed, 642 insertions(+), 554 deletions(-) diff --git a/prettymaps/presets/abraca-redencao.json b/prettymaps/presets/abraca-redencao.json index 9acf646..d194c87 100644 --- a/prettymaps/presets/abraca-redencao.json +++ b/prettymaps/presets/abraca-redencao.json @@ -1,137 +1,160 @@ { - "layers": { - "perimeter": {}, - "streets": { - "width": { - "path": 1.5, - "footway": 2, - "service": 3 - } - }, - "building": { - "tags": { - "building": true, - "leisure": ["track","pitch"], - "landuse": "construction" - } - }, - "school": { - "tags": { - "amenity": "school" - } - }, - "water": { - "tags": { - "amenity": "fountain", - "natural": [ - "water", - "bay" - ] - } - }, - "forest": { - "tags": { - "landuse": "forest" - } - }, - "garden": { - "tags": { - "landuse": "grass", - "leisure": ["garden","dog_park","playground"] - } - }, - "green": { - "tags": { - "landuse": [ - "grass", - "orchard" - ], - "natural": [ - "island", - "wood" - ], - "leisure": "park" - } - }, - "park": { - "tags": { - "leisure": ["park", "sports_centre"] - } - } - }, - "style": { - "perimeter": { - "fill": false, - "lw": 0, - "zorder": 0 - }, - "background": { - "dilate": 20, - "fc": "#F2F4CB", - "zorder": -1 - }, - "green": { - "fc": "#8BB174", - "ec": "#2F3737", - "lw": 1, - "zorder": 1 - }, - "forest": { - "fc": "#64B96A", - "ec": "#2F3737", - "lw": 1, - "zorder": 2 - }, - "garden": { - "fc": "#98fb98", - "ec": "#2F3737", - "lw": 1, - "zorder": 2 - }, - "water": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "sea": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "waterway": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "school": { - "fc": "#FCE19C", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "park": { - "fill": false, - "ec": "#000", - "lw": 1, - "zorder": 3 - }, - "streets": { - "fc": "#ffefd5", - "ec": "#2a3037", - "lw": 1, - "zorder": 4 - }, - "building": { - "palette": [ - "#fff" - ], - "ec": "#000", - "lw": 0.5, - "zorder": 5 - } - }, - "radius": false -} \ No newline at end of file + "layers": { + "perimeter": {}, + "streets": { + "width": { + "path": 1.5, + "footway": 2, + "service": 3 + } + }, + "building": { + "tags": { + "building": true, + "leisure": [ + "track", + "pitch" + ], + "landuse": "construction" + } + }, + "school": { + "tags": { + "amenity": "school" + } + }, + "water": { + "tags": { + "amenity": "fountain", + "natural": [ + "water", + "bay" + ] + } + }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, + "forest": { + "tags": { + "landuse": "forest" + } + }, + "garden": { + "tags": { + "landuse": "grass", + "leisure": [ + "garden", + "dog_park", + "playground" + ] + } + }, + "green": { + "tags": { + "landuse": [ + "grass", + "orchard" + ], + "natural": [ + "island", + "wood" + ], + "leisure": "park" + } + }, + "park": { + "tags": { + "leisure": [ + "park", + "sports_centre" + ] + } + } + }, + "style": { + "perimeter": { + "fill": false, + "lw": 0, + "zorder": 0 + }, + "background": { + "dilate": 20, + "fc": "#F2F4CB", + "zorder": -1 + }, + "green": { + "fc": "#8BB174", + "ec": "#2F3737", + "lw": 1, + "zorder": 1 + }, + "forest": { + "fc": "#64B96A", + "ec": "#2F3737", + "lw": 1, + "zorder": 2 + }, + "garden": { + "fc": "#98fb98", + "ec": "#2F3737", + "lw": 1, + "zorder": 2 + }, + "water": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "sea": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "waterway": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "school": { + "fc": "#FCE19C", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "park": { + "fill": false, + "ec": "#000", + "lw": 1, + "zorder": 3 + }, + "streets": { + "fc": "#ffefd5", + "ec": "#2a3037", + "lw": 1, + "zorder": 4 + }, + "building": { + "palette": [ + "#fff" + ], + "ec": "#000", + "lw": 0.5, + "zorder": 5 + } + }, + "radius": false +} diff --git a/prettymaps/presets/cb-bf-f.json b/prettymaps/presets/cb-bf-f.json index 587b907..4e0545a 100644 --- a/prettymaps/presets/cb-bf-f.json +++ b/prettymaps/presets/cb-bf-f.json @@ -1,104 +1,117 @@ { - "layers": { - "streets": { - "width": { - "trunk": 6, - "primary": 6, - "secondary": 5, - "tertiary": 4, - "residential": 3.5, - "pedestrian": 3, - "footway": 3, - "path": 3 - } - }, - "building": { - "tags": { - "building": true - } - }, - "water": { - "tags": { - "natural": [ - "water", - "bay" - ] - } - }, - "park": { - "tags": { - "leisure": "park" - } - }, - "forest": { - "tags": { - "landuse": "forest" - } - }, - "garden": { - "tags": { - "leisure": "garden" - } - } + "layers": { + "streets": { + "width": { + "trunk": 6, + "primary": 6, + "secondary": 5, + "tertiary": 4, + "residential": 3.5, + "pedestrian": 3, + "footway": 3, + "path": 3 + } }, - "style": { - "perimeter": { - "fill": false, - "lw": 0, - "zorder": 0 - }, - "park": { - "fc": "#AABD8C", - "ec": "#87996b", - "lw": 1, - "zorder": 1 - }, - "forest": { - "fc": "#78A58D", - "ec": "#658a76", - "lw": 1, - "zorder": 1 - }, - "garden": { - "fc": "#a9d1a9", - "ec": "#8ab58a", - "lw": 1, - "zorder": 1 - }, - "water": { - "fc": "#92D5F2", - "ec": "#6da8c2", - "lw": 1, - "zorder": 2 - }, - "sea": { - "fc": "#92D5F2", - "ec": "#6da8c2", - "lw": 1, - "zorder": 2 - }, - "waterway": { - "fc": "#92D5F2", - "ec": "#6da8c2", - "lw": 1, - "zorder": 2 - }, - "streets": { - "fc": "#F1E6D0", - "ec": "#2F3737", - "lw": 1.5, - "zorder": 3 - }, - "building": { - "palette": [ - "#fff" - ], - "ec": "#2F3737", - "lw": 1, - "zorder": 4 - } + "building": { + "tags": { + "building": true + } }, - "circle": null, - "radius": null, - "dilate": 0 -} \ No newline at end of file + "water": { + "tags": { + "natural": [ + "water", + "bay" + ] + } + }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, + "park": { + "tags": { + "leisure": "park" + } + }, + "forest": { + "tags": { + "landuse": "forest" + } + }, + "garden": { + "tags": { + "leisure": "garden" + } + } + }, + "style": { + "perimeter": { + "fill": false, + "lw": 0, + "zorder": 0 + }, + "park": { + "fc": "#AABD8C", + "ec": "#87996b", + "lw": 1, + "zorder": 1 + }, + "forest": { + "fc": "#78A58D", + "ec": "#658a76", + "lw": 1, + "zorder": 1 + }, + "garden": { + "fc": "#a9d1a9", + "ec": "#8ab58a", + "lw": 1, + "zorder": 1 + }, + "water": { + "fc": "#92D5F2", + "ec": "#6da8c2", + "lw": 1, + "zorder": 2 + }, + "sea": { + "fc": "#92D5F2", + "ec": "#6da8c2", + "lw": 1, + "zorder": 2 + }, + "waterway": { + "fc": "#92D5F2", + "ec": "#6da8c2", + "lw": 1, + "zorder": 2 + }, + "streets": { + "fc": "#F1E6D0", + "ec": "#2F3737", + "lw": 1.5, + "zorder": 3 + }, + "building": { + "palette": [ + "#fff" + ], + "ec": "#2F3737", + "lw": 1, + "zorder": 4 + } + }, + "circle": null, + "radius": null, + "dilate": 0 +} diff --git a/prettymaps/presets/heerhugowaard.json b/prettymaps/presets/heerhugowaard.json index 7c8dd5b..d54a986 100644 --- a/prettymaps/presets/heerhugowaard.json +++ b/prettymaps/presets/heerhugowaard.json @@ -1,146 +1,159 @@ { - "layers": { - "perimeter": {}, - "streets": { - "width": { - "motorway": 5, - "trunk": 5, - "primary": 4.5, - "secondary": 4, - "tertiary": 3.5, - "cycleway": 3.5, - "residential": 3, - "service": 2, - "unclassified": 2, - "pedestrian": 2, - "footway": 1 - } - }, - "building": { - "tags": { - "building": true, - "landuse": "construction" - } - }, - "water": { - "tags": { - "natural": [ - "water", - "bay" - ] - } - }, - "forest": { - "tags": { - "landuse": "forest" - } - }, - "green": { - "tags": { - "landuse": [ - "grass", - "orchard" - ], - "natural": [ - "island", - "wood" - ], - "leisure": "park" - } - }, - "beach": { - "tags": { - "natural": "beach" - } - }, - "parking": { - "tags": { - "amenity": "parking", - "highway": "pedestrian", - "man_made": "pier" - } - } - }, - "style": { - "perimeter": { - "fill": false, - "lw": 0, - "zorder": 0 - }, - "background": { - "fc": "#F2F4CB", - "zorder": -1 - }, - "green": { - "fc": "#8BB174", - "ec": "#2F3737", - "hatch_c": "#A7C497", - "hatch": "ooo...", - "lw": 1, - "zorder": 1 - }, - "forest": { - "fc": "#64B96A", - "ec": "#2F3737", - "lw": 1, - "zorder": 2 - }, - "water": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "hatch_c": "#9bc3d4", - "hatch": "ooo...", - "lw": 1, - "zorder": 3 - }, - "sea": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "hatch_c": "#9bc3d4", - "hatch": "ooo...", - "lw": 1, - "zorder": 3 - }, - "waterway": { - "fc": "#a8e1e6", - "ec": "#2F3737", - "hatch_c": "#9bc3d4", - "hatch": "ooo...", - "lw": 1, - "zorder": 3 - }, - "beach": { - "fc": "#FCE19C", - "ec": "#2F3737", - "hatch_c": "#d4d196", - "hatch": "ooo...", - "lw": 1, - "zorder": 3 - }, - "parking": { - "fc": "#F2F4CB", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "streets": { - "fc": "#2F3737", - "ec": "#475657", - "alpha": 1, - "lw": 0, - "zorder": 4 - }, - "building": { - "palette": [ - "#433633", - "#FF5E5B" - ], - "ec": "#2F3737", - "lw": 0.5, - "zorder": 5 - } - }, - "circle": null, - "radius": 800, - "dilate": 100 -} \ No newline at end of file + "layers": { + "perimeter": {}, + "streets": { + "width": { + "motorway": 5, + "trunk": 5, + "primary": 4.5, + "secondary": 4, + "tertiary": 3.5, + "cycleway": 3.5, + "residential": 3, + "service": 2, + "unclassified": 2, + "pedestrian": 2, + "footway": 1 + } + }, + "building": { + "tags": { + "building": true, + "landuse": "construction" + } + }, + "water": { + "tags": { + "natural": [ + "water", + "bay" + ] + } + }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, + "forest": { + "tags": { + "landuse": "forest" + } + }, + "green": { + "tags": { + "landuse": [ + "grass", + "orchard" + ], + "natural": [ + "island", + "wood" + ], + "leisure": "park" + } + }, + "beach": { + "tags": { + "natural": "beach" + } + }, + "parking": { + "tags": { + "amenity": "parking", + "highway": "pedestrian", + "man_made": "pier" + } + } + }, + "style": { + "perimeter": { + "fill": false, + "lw": 0, + "zorder": 0 + }, + "background": { + "fc": "#F2F4CB", + "zorder": -1 + }, + "green": { + "fc": "#8BB174", + "ec": "#2F3737", + "hatch_c": "#A7C497", + "hatch": "ooo...", + "lw": 1, + "zorder": 1 + }, + "forest": { + "fc": "#64B96A", + "ec": "#2F3737", + "lw": 1, + "zorder": 2 + }, + "water": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "sea": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "waterway": { + "fc": "#a8e1e6", + "ec": "#2F3737", + "hatch_c": "#9bc3d4", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "beach": { + "fc": "#FCE19C", + "ec": "#2F3737", + "hatch_c": "#d4d196", + "hatch": "ooo...", + "lw": 1, + "zorder": 3 + }, + "parking": { + "fc": "#F2F4CB", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "streets": { + "fc": "#2F3737", + "ec": "#475657", + "alpha": 1, + "lw": 0, + "zorder": 4 + }, + "building": { + "palette": [ + "#433633", + "#FF5E5B" + ], + "ec": "#2F3737", + "lw": 0.5, + "zorder": 5 + } + }, + "circle": null, + "radius": 800, + "dilate": 100 +} diff --git a/prettymaps/presets/macao.json b/prettymaps/presets/macao.json index da43e0d..1236688 100644 --- a/prettymaps/presets/macao.json +++ b/prettymaps/presets/macao.json @@ -1,134 +1,147 @@ { - "layers": { - "perimeter": {}, - "streets": { - "custom_filter": "[\"highway\"~\"motorway|trunk|primary|secondary|tertiary|residential|service|unclassified|pedestrian|footway\"]", - "width": { - "motorway": 5, - "trunk": 5, - "primary": 4.5, - "secondary": 4, - "tertiary": 3.5, - "residential": 3, - "service": 2, - "unclassified": 2, - "pedestrian": 2, - "footway": 1 - } - }, - "building": { - "tags": { - "building": true, - "landuse": "construction" - }, - "union": false - }, - "water": { - "tags": { - "natural": [ - "water", - "bay" - ] - } - }, - "green": { - "tags": { - "landuse": "grass", - "natural": [ - "island", - "wood" - ], - "leisure": "park" - } - }, - "forest": { - "tags": { - "landuse": "forest" - } - }, - "parking": { - "tags": { - "amenity": "parking", - "highway": "pedestrian", - "man_made": "pier" - } - } + "layers": { + "perimeter": {}, + "streets": { + "custom_filter": "[\"highway\"~\"motorway|trunk|primary|secondary|tertiary|residential|service|unclassified|pedestrian|footway\"]", + "width": { + "motorway": 5, + "trunk": 5, + "primary": 4.5, + "secondary": 4, + "tertiary": 3.5, + "residential": 3, + "service": 2, + "unclassified": 2, + "pedestrian": 2, + "footway": 1 + } }, - "style": { - "background": { - "fc": "#F2F4CB", - "ec": "#dadbc1", - "hatch": "ooo...", - "zorder": -1 - }, - "perimeter": { - "fc": "#F2F4CB", - "ec": "#dadbc1", - "lw": 0, - "hatch": "ooo...", - "zorder": 0 - }, - "green": { - "fc": "#D0F1BF", - "ec": "#2F3737", - "lw": 1, - "zorder": 1 - }, - "forest": { - "fc": "#64B96A", - "ec": "#2F3737", - "lw": 1, - "zorder": 1 - }, - "water": { - "fc": "#a1e3ff", - "ec": "#2F3737", - "hatch": "ooo...", - "hatch_c": "#85c9e6", - "lw": 1, - "zorder": 2 - }, - "sea": { - "fc": "#a1e3ff", - "ec": "#2F3737", - "hatch": "ooo...", - "hatch_c": "#85c9e6", - "lw": 1, - "zorder": 2 - }, - "waterway": { - "fc": "#a1e3ff", - "ec": "#2F3737", - "hatch": "ooo...", - "hatch_c": "#85c9e6", - "lw": 1, - "zorder": 2 - }, - "parking": { - "fc": "#F2F4CB", - "ec": "#2F3737", - "lw": 1, - "zorder": 3 - }, - "streets": { - "fc": "#2F3737", - "ec": "#475657", - "alpha": 1, - "lw": 0, - "zorder": 3 - }, - "building": { - "palette": [ - "#FFC857", - "#E9724C", - "#C5283D" - ], - "ec": "#2F3737", - "lw": 0.5, - "zorder": 4 - } + "building": { + "tags": { + "building": true, + "landuse": "construction" + }, + "union": false }, - "circle": true, - "radius": 1100, - "dilate": 0 -} \ No newline at end of file + "water": { + "tags": { + "natural": [ + "water", + "bay" + ] + } + }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, + "green": { + "tags": { + "landuse": "grass", + "natural": [ + "island", + "wood" + ], + "leisure": "park" + } + }, + "forest": { + "tags": { + "landuse": "forest" + } + }, + "parking": { + "tags": { + "amenity": "parking", + "highway": "pedestrian", + "man_made": "pier" + } + } + }, + "style": { + "background": { + "fc": "#F2F4CB", + "ec": "#dadbc1", + "hatch": "ooo...", + "zorder": -1 + }, + "perimeter": { + "fc": "#F2F4CB", + "ec": "#dadbc1", + "lw": 0, + "hatch": "ooo...", + "zorder": 0 + }, + "green": { + "fc": "#D0F1BF", + "ec": "#2F3737", + "lw": 1, + "zorder": 1 + }, + "forest": { + "fc": "#64B96A", + "ec": "#2F3737", + "lw": 1, + "zorder": 1 + }, + "water": { + "fc": "#a1e3ff", + "ec": "#2F3737", + "hatch": "ooo...", + "hatch_c": "#85c9e6", + "lw": 1, + "zorder": 2 + }, + "sea": { + "fc": "#a1e3ff", + "ec": "#2F3737", + "hatch": "ooo...", + "hatch_c": "#85c9e6", + "lw": 1, + "zorder": 2 + }, + "waterway": { + "fc": "#a1e3ff", + "ec": "#2F3737", + "hatch": "ooo...", + "hatch_c": "#85c9e6", + "lw": 1, + "zorder": 2 + }, + "parking": { + "fc": "#F2F4CB", + "ec": "#2F3737", + "lw": 1, + "zorder": 3 + }, + "streets": { + "fc": "#2F3737", + "ec": "#475657", + "alpha": 1, + "lw": 0, + "zorder": 3 + }, + "building": { + "palette": [ + "#FFC857", + "#E9724C", + "#C5283D" + ], + "ec": "#2F3737", + "lw": 0.5, + "zorder": 4 + } + }, + "circle": true, + "radius": 1100, + "dilate": 0 +} diff --git a/prettymaps/presets/minimal.json b/prettymaps/presets/minimal.json index 2d21eb1..09035bc 100644 --- a/prettymaps/presets/minimal.json +++ b/prettymaps/presets/minimal.json @@ -1,44 +1,44 @@ { - "layers": { - "perimeter": {}, - "streets": { - "width": { - "motorway": 5, - "trunk": 5, - "primary": 4, - "secondary": 3, - "tertiary": 2, - "residential": 2 - } - }, - "building": { - "tags": { - "building": true - } - } + "layers": { + "perimeter": {}, + "streets": { + "width": { + "motorway": 5, + "trunk": 5, + "primary": 4, + "secondary": 3, + "tertiary": 2, + "residential": 2 + } }, - "style": { - "perimeter": { - "fill": false, - "lw": 0, - "zorder": 0 - }, - "background": { - "fc": "#fff", - "zorder": -1 - }, - "streets": { - "fc": "#000", - "lw": 0, - "zorder": 4 - }, - "building": { - "fc": "#fff", - "ec": "#000", - "lw": 0.5, - "zorder": 5 - } + "building": { + "tags": { + "building": true + } + } + }, + "style": { + "perimeter": { + "fill": false, + "lw": 0, + "zorder": 0 }, - "circle": null, - "radius": 400 -} \ No newline at end of file + "background": { + "fc": "#fff", + "zorder": -1 + }, + "streets": { + "fc": "#000", + "lw": 0, + "zorder": 4 + }, + "building": { + "fc": "#fff", + "ec": "#000", + "lw": 0.5, + "zorder": 5 + } + }, + "circle": null, + "radius": 400 +} diff --git a/prettymaps/presets/plotter.json b/prettymaps/presets/plotter.json index 60fed37..32e35fe 100644 --- a/prettymaps/presets/plotter.json +++ b/prettymaps/presets/plotter.json @@ -30,6 +30,19 @@ ] } }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, "forest": { "tags": { "landuse": "forest" diff --git a/prettymaps/presets/tijuca.json b/prettymaps/presets/tijuca.json index fbbb49e..7478b54 100644 --- a/prettymaps/presets/tijuca.json +++ b/prettymaps/presets/tijuca.json @@ -42,6 +42,19 @@ "natural": "water" } }, + "sea": {}, + "waterway": { + "tags": { + "waterway": [ + "river", + "stream" + ] + }, + "width": { + "river": 20, + "stream": 10 + } + }, "pedestrian": { "tags": { "area:highway": "pedestrian"