From 61a330145f85e6caebe80db621863abecd2b0a48 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Wed, 24 Apr 2019 16:04:40 +0900 Subject: [PATCH 01/12] Add line rendering and text labels for ridges and aretes from alt-colors style This commit is based off of the osm-carto-alternative-colors style at github.com/imagico/osm-carto-alternative-colors/ by @imagico, including the arete.svg, arete2.svg and ridge.svg symbols A linear rendering is added for ridges and aretes at z13 and above. In addition, text labels following the line are added at z15 and above in the same style used for cliffs and embankments --- project.mml | 14 +++++++++++++- style/landcover.mss | 11 +++++++++++ symbols/arete.svg | 39 +++++++++++++++++++++++++++++++++++++++ symbols/arete2.svg | 39 +++++++++++++++++++++++++++++++++++++++ symbols/ridge.svg | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 symbols/arete.svg create mode 100644 symbols/arete2.svg create mode 100644 symbols/ridge.svg diff --git a/project.mml b/project.mml index 29eb0dc955..ce64aa4ea3 100644 --- a/project.mml +++ b/project.mml @@ -616,6 +616,18 @@ Layer: way, "natural", man_made FROM planet_osm_line WHERE "natural" = 'cliff' OR man_made = 'embankment' + UNION ALL + SELECT + ST_Difference( + way, + (SELECT ST_Union(ST_Buffer(way, 6*sqrt(!pixel_width!::real*!pixel_height!::real))) + FROM planet_osm_point p + WHERE "natural" IN ('peak', 'volcano', 'saddle') + AND ST_DWithin(l.way, p.way, 6*sqrt(!pixel_width!::real*!pixel_height!::real)) + ) + ), "natural", man_made + FROM planet_osm_line l + WHERE "natural" IN ('ridge', 'arete') ) AS cliffs properties: cache-features: true @@ -2024,7 +2036,7 @@ Layer: FROM planet_osm_line WHERE (man_made IN ('pier', 'breakwater', 'groyne', 'embankment') OR waterway IN ('dam', 'weir') - OR "natural" IN ('cliff')) + OR "natural" IN ('arete', 'cliff', 'ridge')) AND name IS NOT NULL ) AS text_line properties: diff --git a/style/landcover.mss b/style/landcover.mss index 59736f4af3..7cb90fb361 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -822,6 +822,15 @@ line-pattern-file: url('symbols/cliff2.svg'); } } + [natural = 'ridge'][zoom >= 13] { + line-pattern-file: url('symbols/ridge.svg'); + } + [natural = 'arete'][zoom >= 13] { + line-pattern-file: url('symbols/arete.svg'); + [zoom >= 15] { + line-pattern-file: url('symbols/arete2.svg'); + } + } [man_made = 'embankment'][zoom >= 15]::man_made { line-pattern-file: url('symbols/embankment.svg'); } @@ -904,7 +913,9 @@ } #text-line { + [feature = 'natural_arete'][zoom >= 15], [feature = 'natural_cliff'][zoom >= 15], + [feature = 'natural_ridge'][zoom >= 15], [feature = 'man_made_embankment'][zoom >= 15] { text-name: "[name]"; text-halo-radius: @standard-halo-radius; diff --git a/symbols/arete.svg b/symbols/arete.svg new file mode 100644 index 0000000000..aac7dc988b --- /dev/null +++ b/symbols/arete.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete2.svg b/symbols/arete2.svg new file mode 100644 index 0000000000..28a723ae99 --- /dev/null +++ b/symbols/arete2.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/ridge.svg b/symbols/ridge.svg new file mode 100644 index 0000000000..417a61d1c1 --- /dev/null +++ b/symbols/ridge.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap + From 56e8b4a499473884e49946d865b309e62e0c7ae0 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Wed, 24 Apr 2019 16:15:24 +0900 Subject: [PATCH 02/12] Render ridges and aretes without a gap around saddles and peaks --- project.mml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/project.mml b/project.mml index ce64aa4ea3..402f76a2a8 100644 --- a/project.mml +++ b/project.mml @@ -615,19 +615,7 @@ Layer: (SELECT way, "natural", man_made FROM planet_osm_line - WHERE "natural" = 'cliff' OR man_made = 'embankment' - UNION ALL - SELECT - ST_Difference( - way, - (SELECT ST_Union(ST_Buffer(way, 6*sqrt(!pixel_width!::real*!pixel_height!::real))) - FROM planet_osm_point p - WHERE "natural" IN ('peak', 'volcano', 'saddle') - AND ST_DWithin(l.way, p.way, 6*sqrt(!pixel_width!::real*!pixel_height!::real)) - ) - ), "natural", man_made - FROM planet_osm_line l - WHERE "natural" IN ('ridge', 'arete') + WHERE "natural" IN ('arete', 'cliff', 'ridge') OR man_made = 'embankment' ) AS cliffs properties: cache-features: true From 9b4521242a3a3df1a99ec166eb197ddd5754d69a Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 25 Apr 2019 14:55:45 +0900 Subject: [PATCH 03/12] Render ridges and aretes with thinner lines at z14 and even thinner at z13 --- style/landcover.mss | 15 +- symbols/arete-hz.svg | 66 +++++ symbols/arete-lz.svg | 557 +++++++++++++++++++++++++++++++++++++++++ symbols/arete-mz.svg | 64 +++++ symbols/ridge-lz.svg | 582 +++++++++++++++++++++++++++++++++++++++++++ symbols/ridge-mz.svg | 65 +++++ 6 files changed, 1346 insertions(+), 3 deletions(-) create mode 100644 symbols/arete-hz.svg create mode 100644 symbols/arete-lz.svg create mode 100644 symbols/arete-mz.svg create mode 100644 symbols/ridge-lz.svg create mode 100644 symbols/ridge-mz.svg diff --git a/style/landcover.mss b/style/landcover.mss index 7cb90fb361..7377f3ace5 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -823,12 +823,21 @@ } } [natural = 'ridge'][zoom >= 13] { - line-pattern-file: url('symbols/ridge.svg'); + line-pattern-file: url('symbols/ridge-lz.svg'); + [zoom >= 14] { + line-pattern-file: url('symbols/ridge-mz.svg'); + } + [zoom >= 15] { + line-pattern-file: url('symbols/ridge.svg'); + } } [natural = 'arete'][zoom >= 13] { - line-pattern-file: url('symbols/arete.svg'); + line-pattern-file: url('symbols/arete-lz.svg'); + [zoom >= 14] { + line-pattern-file: url('symbols/arete-mz.svg'); + } [zoom >= 15] { - line-pattern-file: url('symbols/arete2.svg'); + line-pattern-file: url('symbols/arete-hz.svg'); } } [man_made = 'embankment'][zoom >= 15]::man_made { diff --git a/symbols/arete-hz.svg b/symbols/arete-hz.svg new file mode 100644 index 0000000000..5908b00524 --- /dev/null +++ b/symbols/arete-hz.svg @@ -0,0 +1,66 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete-lz.svg b/symbols/arete-lz.svg new file mode 100644 index 0000000000..9ed6398e30 --- /dev/null +++ b/symbols/arete-lz.svg @@ -0,0 +1,557 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Created with Snap + diff --git a/symbols/arete-mz.svg b/symbols/arete-mz.svg new file mode 100644 index 0000000000..961f6ea0fb --- /dev/null +++ b/symbols/arete-mz.svg @@ -0,0 +1,64 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/ridge-lz.svg b/symbols/ridge-lz.svg new file mode 100644 index 0000000000..dda7e5793d --- /dev/null +++ b/symbols/ridge-lz.svg @@ -0,0 +1,582 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Created with Snap + diff --git a/symbols/ridge-mz.svg b/symbols/ridge-mz.svg new file mode 100644 index 0000000000..7d94f14a4e --- /dev/null +++ b/symbols/ridge-mz.svg @@ -0,0 +1,65 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + From 6ee7251b761e2476247f5ba0940c2a8cc0057277 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 25 Apr 2019 14:59:57 +0900 Subject: [PATCH 04/12] Added additional svg files for ridges and aretes testing --- symbols/arete0c.svg | 73 ++++++++++++++++++++++++++++++++++++++++++++ symbols/arete1c.svg | 65 +++++++++++++++++++++++++++++++++++++++ symbols/arete3c.svg | 65 +++++++++++++++++++++++++++++++++++++++ symbols/arete4.svg | 66 ++++++++++++++++++++++++++++++++++++++++ symbols/ridge1c.svg | 74 +++++++++++++++++++++++++++++++++++++++++++++ symbols/ridge2c.svg | 66 ++++++++++++++++++++++++++++++++++++++++ symbols/ridge3c.svg | 64 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 473 insertions(+) create mode 100644 symbols/arete0c.svg create mode 100644 symbols/arete1c.svg create mode 100644 symbols/arete3c.svg create mode 100644 symbols/arete4.svg create mode 100644 symbols/ridge1c.svg create mode 100644 symbols/ridge2c.svg create mode 100644 symbols/ridge3c.svg diff --git a/symbols/arete0c.svg b/symbols/arete0c.svg new file mode 100644 index 0000000000..7bda0f7ffb --- /dev/null +++ b/symbols/arete0c.svg @@ -0,0 +1,73 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + + diff --git a/symbols/arete1c.svg b/symbols/arete1c.svg new file mode 100644 index 0000000000..942cf68ff6 --- /dev/null +++ b/symbols/arete1c.svg @@ -0,0 +1,65 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete3c.svg b/symbols/arete3c.svg new file mode 100644 index 0000000000..b5ccd5c550 --- /dev/null +++ b/symbols/arete3c.svg @@ -0,0 +1,65 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete4.svg b/symbols/arete4.svg new file mode 100644 index 0000000000..52ad7aa9ba --- /dev/null +++ b/symbols/arete4.svg @@ -0,0 +1,66 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/ridge1c.svg b/symbols/ridge1c.svg new file mode 100644 index 0000000000..664c84c897 --- /dev/null +++ b/symbols/ridge1c.svg @@ -0,0 +1,74 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + + diff --git a/symbols/ridge2c.svg b/symbols/ridge2c.svg new file mode 100644 index 0000000000..41ede48d8d --- /dev/null +++ b/symbols/ridge2c.svg @@ -0,0 +1,66 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/ridge3c.svg b/symbols/ridge3c.svg new file mode 100644 index 0000000000..c5d8f1be91 --- /dev/null +++ b/symbols/ridge3c.svg @@ -0,0 +1,64 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + From 50919ca89635db49e864245cbdfed86d9925f673 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 26 Apr 2019 07:10:29 +0900 Subject: [PATCH 05/12] Render ridges and aretes with thin line pattern at z13-14 and full pattern at z15 and above --- style/landcover.mss | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/style/landcover.mss b/style/landcover.mss index 7377f3ace5..6ab20bafd6 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -823,19 +823,13 @@ } } [natural = 'ridge'][zoom >= 13] { - line-pattern-file: url('symbols/ridge-lz.svg'); - [zoom >= 14] { - line-pattern-file: url('symbols/ridge-mz.svg'); - } + line-pattern-file: url('symbols/ridge-mz.svg'); [zoom >= 15] { line-pattern-file: url('symbols/ridge.svg'); } } [natural = 'arete'][zoom >= 13] { - line-pattern-file: url('symbols/arete-lz.svg'); - [zoom >= 14] { - line-pattern-file: url('symbols/arete-mz.svg'); - } + line-pattern-file: url('symbols/arete-mz.svg'); [zoom >= 15] { line-pattern-file: url('symbols/arete-hz.svg'); } From 5ef824fac2f4267451bc8211276a597cfa33af68 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 26 Apr 2019 08:26:23 +0900 Subject: [PATCH 06/12] Use symmetrical pattern for aretes with thinner pattern at z13-z14, thicker at >=z15 --- style/landcover.mss | 4 ++-- symbols/{arete0c.svg => arete0b.svg} | 0 symbols/{arete1c.svg => arete1b.svg} | 0 symbols/{arete3c.svg => arete2b.svg} | 0 symbols/{arete4.svg => arete3b.svg} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename symbols/{arete0c.svg => arete0b.svg} (100%) rename symbols/{arete1c.svg => arete1b.svg} (100%) rename symbols/{arete3c.svg => arete2b.svg} (100%) rename symbols/{arete4.svg => arete3b.svg} (100%) diff --git a/style/landcover.mss b/style/landcover.mss index 6ab20bafd6..a562b4ac36 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -829,9 +829,9 @@ } } [natural = 'arete'][zoom >= 13] { - line-pattern-file: url('symbols/arete-mz.svg'); + line-pattern-file: url('symbols/arete1b.svg'); [zoom >= 15] { - line-pattern-file: url('symbols/arete-hz.svg'); + line-pattern-file: url('symbols/arete2b.svg'); } } [man_made = 'embankment'][zoom >= 15]::man_made { diff --git a/symbols/arete0c.svg b/symbols/arete0b.svg similarity index 100% rename from symbols/arete0c.svg rename to symbols/arete0b.svg diff --git a/symbols/arete1c.svg b/symbols/arete1b.svg similarity index 100% rename from symbols/arete1c.svg rename to symbols/arete1b.svg diff --git a/symbols/arete3c.svg b/symbols/arete2b.svg similarity index 100% rename from symbols/arete3c.svg rename to symbols/arete2b.svg diff --git a/symbols/arete4.svg b/symbols/arete3b.svg similarity index 100% rename from symbols/arete4.svg rename to symbols/arete3b.svg From a467f85d029475b9d7fd5122b04d02441adc8ad9 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 26 Apr 2019 14:28:38 +0900 Subject: [PATCH 07/12] New symmetrical patterns for aretes --- style/landcover.mss | 4 +- symbols/arete-hz.svg | 66 ----- symbols/arete-lz.svg | 557 ----------------------------------------- symbols/arete-mid.svg | 40 +++ symbols/arete-mz.svg | 64 ----- symbols/arete-wide.svg | 40 +++ symbols/arete0b.svg | 73 ------ symbols/arete1b.svg | 65 ----- symbols/arete2b.svg | 65 ----- symbols/arete3b.svg | 66 ----- symbols/ridge1c.svg | 74 ------ symbols/ridge2c.svg | 66 ----- symbols/ridge3c.svg | 64 ----- 13 files changed, 82 insertions(+), 1162 deletions(-) delete mode 100644 symbols/arete-hz.svg delete mode 100644 symbols/arete-lz.svg create mode 100644 symbols/arete-mid.svg delete mode 100644 symbols/arete-mz.svg create mode 100644 symbols/arete-wide.svg delete mode 100644 symbols/arete0b.svg delete mode 100644 symbols/arete1b.svg delete mode 100644 symbols/arete2b.svg delete mode 100644 symbols/arete3b.svg delete mode 100644 symbols/ridge1c.svg delete mode 100644 symbols/ridge2c.svg delete mode 100644 symbols/ridge3c.svg diff --git a/style/landcover.mss b/style/landcover.mss index a562b4ac36..a05de156ce 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -829,9 +829,9 @@ } } [natural = 'arete'][zoom >= 13] { - line-pattern-file: url('symbols/arete1b.svg'); + line-pattern-file: url('symbols/arete-mid.svg'); [zoom >= 15] { - line-pattern-file: url('symbols/arete2b.svg'); + line-pattern-file: url('symbols/arete-wide.svg'); } } [man_made = 'embankment'][zoom >= 15]::man_made { diff --git a/symbols/arete-hz.svg b/symbols/arete-hz.svg deleted file mode 100644 index 5908b00524..0000000000 --- a/symbols/arete-hz.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete-lz.svg b/symbols/arete-lz.svg deleted file mode 100644 index 9ed6398e30..0000000000 --- a/symbols/arete-lz.svg +++ /dev/null @@ -1,557 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Created with Snap - diff --git a/symbols/arete-mid.svg b/symbols/arete-mid.svg new file mode 100644 index 0000000000..2f0f7fd32f --- /dev/null +++ b/symbols/arete-mid.svg @@ -0,0 +1,40 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete-mz.svg b/symbols/arete-mz.svg deleted file mode 100644 index 961f6ea0fb..0000000000 --- a/symbols/arete-mz.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete-wide.svg b/symbols/arete-wide.svg new file mode 100644 index 0000000000..b6b00d75e6 --- /dev/null +++ b/symbols/arete-wide.svg @@ -0,0 +1,40 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/arete0b.svg b/symbols/arete0b.svg deleted file mode 100644 index 7bda0f7ffb..0000000000 --- a/symbols/arete0b.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - - diff --git a/symbols/arete1b.svg b/symbols/arete1b.svg deleted file mode 100644 index 942cf68ff6..0000000000 --- a/symbols/arete1b.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete2b.svg b/symbols/arete2b.svg deleted file mode 100644 index b5ccd5c550..0000000000 --- a/symbols/arete2b.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete3b.svg b/symbols/arete3b.svg deleted file mode 100644 index 52ad7aa9ba..0000000000 --- a/symbols/arete3b.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/ridge1c.svg b/symbols/ridge1c.svg deleted file mode 100644 index 664c84c897..0000000000 --- a/symbols/ridge1c.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - - diff --git a/symbols/ridge2c.svg b/symbols/ridge2c.svg deleted file mode 100644 index 41ede48d8d..0000000000 --- a/symbols/ridge2c.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/ridge3c.svg b/symbols/ridge3c.svg deleted file mode 100644 index c5d8f1be91..0000000000 --- a/symbols/ridge3c.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - From 1ef8b3936d9723969d47d771a43bdbb039e6f032 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 27 Feb 2020 17:14:08 +0900 Subject: [PATCH 08/12] Change ridge and arete initial zoom to z14 --- style/landcover.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style/landcover.mss b/style/landcover.mss index a05de156ce..29db51bf7a 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -822,13 +822,13 @@ line-pattern-file: url('symbols/cliff2.svg'); } } - [natural = 'ridge'][zoom >= 13] { + [natural = 'ridge'][zoom >= 14] { line-pattern-file: url('symbols/ridge-mz.svg'); [zoom >= 15] { line-pattern-file: url('symbols/ridge.svg'); } } - [natural = 'arete'][zoom >= 13] { + [natural = 'arete'][zoom >= 14] { line-pattern-file: url('symbols/arete-mid.svg'); [zoom >= 15] { line-pattern-file: url('symbols/arete-wide.svg'); From 64e6d974ee99dd3c10e16f18306925c407c8089f Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 27 Feb 2020 17:17:25 +0900 Subject: [PATCH 09/12] Rename ridge and arete files, delete unused files --- style/landcover.mss | 4 +- symbols/arete-wide.svg | 40 --- symbols/arete.svg | 29 +- symbols/arete2.svg | 39 --- symbols/ridge-lz.svg | 582 ----------------------------------------- symbols/ridge-mz.svg | 65 ----- 6 files changed, 17 insertions(+), 742 deletions(-) delete mode 100644 symbols/arete-wide.svg delete mode 100644 symbols/arete2.svg delete mode 100644 symbols/ridge-lz.svg delete mode 100644 symbols/ridge-mz.svg diff --git a/style/landcover.mss b/style/landcover.mss index 29db51bf7a..abd2684657 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -823,7 +823,7 @@ } } [natural = 'ridge'][zoom >= 14] { - line-pattern-file: url('symbols/ridge-mz.svg'); + line-pattern-file: url('symbols/ridge-mid.svg'); [zoom >= 15] { line-pattern-file: url('symbols/ridge.svg'); } @@ -831,7 +831,7 @@ [natural = 'arete'][zoom >= 14] { line-pattern-file: url('symbols/arete-mid.svg'); [zoom >= 15] { - line-pattern-file: url('symbols/arete-wide.svg'); + line-pattern-file: url('symbols/arete.svg'); } } [man_made = 'embankment'][zoom >= 15]::man_made { diff --git a/symbols/arete-wide.svg b/symbols/arete-wide.svg deleted file mode 100644 index b6b00d75e6..0000000000 --- a/symbols/arete-wide.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete.svg b/symbols/arete.svg index aac7dc988b..b6b00d75e6 100644 --- a/symbols/arete.svg +++ b/symbols/arete.svg @@ -5,12 +5,12 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - id="Svg" - width="24" - height="24" - version="1.1"> + version="1.1" + height="32" + width="32" + id="Svg"> + id="metadata911"> @@ -24,16 +24,17 @@ + id="path1018" + d="M 20.224609 2.5 L 19.998047 2.7226562 L 19.953125 2.9492188 L 19.990234 3.1816406 L 20.273438 3.1875 L 20.345703 3.03125 L 20.513672 2.890625 L 20.453125 2.6601562 L 20.224609 2.5 z M 11.755859 5.0722656 L 11.5 5.2050781 L 11.537109 5.4414062 L 11.730469 5.6210938 L 11.917969 5.640625 L 12.015625 5.4765625 L 12.091797 5.1972656 L 11.933594 5.1132812 L 11.755859 5.0722656 z M 28.333984 5.1113281 L 28.134766 5.3691406 L 28.306641 5.6386719 L 28.607422 5.6503906 L 28.738281 5.3808594 L 28.605469 5.15625 L 28.333984 5.1113281 z M 3.8496094 5.9394531 L 3.6289062 6.0117188 L 3.5 6.1796875 L 3.5839844 6.4511719 L 3.8339844 6.4921875 L 4.0097656 6.3789062 L 4.0644531 6.109375 L 3.8496094 5.9394531 z M 20.246094 6.6484375 L 19.933594 6.7851562 L 19.832031 7.1328125 L 20.134766 7.4296875 L 20.511719 7.2480469 L 20.574219 6.8613281 L 20.246094 6.6484375 z M 27.789062 8.8496094 L 27.527344 9.109375 L 27.585938 9.4179688 L 27.792969 9.6210938 L 28.169922 9.5527344 L 28.265625 9.2226562 L 28.142578 8.9667969 L 27.789062 8.8496094 z M 11.351562 8.9140625 L 11.154297 9.4121094 L 11.546875 9.7304688 L 11.962891 9.4648438 L 11.869141 8.9316406 L 11.351562 8.9140625 z M 19.714844 9.1816406 L 19.330078 9.2226562 L 19.298828 9.4589844 L 19.332031 9.7011719 L 19.619141 9.9570312 L 19.900391 9.7988281 L 20.03125 9.4707031 L 19.966797 9.2285156 L 19.714844 9.1816406 z M 3.6191406 9.2734375 L 3.375 9.4492188 L 3.2382812 9.7578125 L 3.4941406 9.9941406 L 3.7558594 10.029297 L 4 9.9042969 L 4.0273438 9.5625 L 3.8496094 9.3671875 L 3.6191406 9.2734375 z M 20.570312 10.294922 L 20.273438 10.519531 L 20.335938 10.882812 L 20.625 11.009766 L 20.908203 10.955078 L 21.066406 10.605469 L 20.849609 10.339844 L 20.570312 10.294922 z M 12.818359 10.609375 L 12.646484 10.90625 L 12.703125 11.183594 L 13.019531 11.380859 L 13.337891 11.193359 L 13.353516 10.876953 L 13.201172 10.632812 L 12.818359 10.609375 z M 4.5996094 10.748047 L 4.3398438 10.783203 L 4.1308594 10.917969 L 4.1386719 11.220703 L 4.3144531 11.507812 L 4.65625 11.431641 L 4.8339844 11.236328 L 4.8691406 10.964844 L 4.5996094 10.748047 z M 10.925781 10.8125 L 10.705078 11.039062 L 10.654297 11.322266 L 10.925781 11.59375 L 11.251953 11.486328 L 11.394531 11.240234 L 11.287109 10.882812 L 10.925781 10.8125 z M 3.0371094 11.15625 L 2.7226562 11.314453 L 2.609375 11.539062 L 2.7675781 11.742188 L 3.0820312 11.966797 L 3.2617188 11.808594 L 3.3984375 11.607422 L 3.3515625 11.224609 L 3.0371094 11.15625 z M 28.158203 11.248047 L 27.693359 11.523438 L 27.859375 12.015625 L 28.394531 12.023438 L 28.554688 11.542969 L 28.158203 11.248047 z M 12.189453 11.330078 L 11.730469 11.521484 L 11.648438 11.945312 L 11.9375 12.302734 L 12.46875 12.201172 L 12.548828 11.675781 L 12.189453 11.330078 z M 19.736328 11.435547 L 19.533203 11.925781 L 19.798828 12.347656 L 20.291016 12.273438 L 20.470703 11.880859 L 20.277344 11.464844 L 19.736328 11.435547 z M 20.291016 12.273438 L 20.501953 12.59375 L 20.732422 12.552734 L 21.017578 12.632812 L 21.228516 12.386719 L 21.128906 12.080078 L 20.808594 11.927734 L 20.521484 12.052734 L 20.291016 12.273438 z M 4.3203125 12.419922 L 3.7167969 12.453125 L 3.6269531 13.025391 L 4.1542969 13.3125 L 4.5605469 12.917969 L 4.3203125 12.419922 z M 27.783203 12.419922 L 27.398438 12.822266 L 27.644531 13.378906 L 28.216797 13.259766 L 28.296875 12.664062 L 27.783203 12.419922 z M 29.240234 12.568359 L 28.898438 12.927734 L 29.117188 13.421875 L 29.625 13.314453 L 29.697266 12.785156 L 29.240234 12.568359 z M 12.402344 12.640625 L 12.197266 13.130859 L 12.462891 13.552734 L 12.955078 13.478516 L 13.136719 13.085938 L 12.941406 12.669922 L 12.402344 12.640625 z M 5.3867188 12.791016 L 5.1386719 12.826172 L 5.0605469 13.072266 L 5.0546875 13.458984 L 5.2871094 13.517578 L 5.5292969 13.513672 L 5.8183594 13.259766 L 5.6953125 12.960938 L 5.3867188 12.791016 z M 20.46875 12.796875 L 20.072266 12.814453 L 19.853516 13.083984 L 19.740234 13.419922 L 20.113281 13.626953 L 20.320312 13.46875 L 20.644531 13.400391 L 20.724609 13.048828 L 20.46875 12.796875 z M 10.390625 12.849609 L 9.9003906 13.074219 L 9.9472656 13.603516 L 10.378906 13.853516 L 10.779297 13.558594 L 10.757812 13.126953 L 10.390625 12.849609 z M 2.6503906 13.167969 L 2.1582031 13.394531 L 2.2050781 13.923828 L 2.6367188 14.171875 L 3.0371094 13.876953 L 3.015625 13.445312 L 2.6503906 13.167969 z M 18.855469 13.173828 L 18.560547 13.400391 L 18.623047 13.763672 L 18.912109 13.888672 L 19.195312 13.833984 L 19.353516 13.486328 L 19.136719 13.21875 L 18.855469 13.173828 z M 18.912109 13.888672 L 18.503906 14.228516 L 18.517578 14.386719 L 18.294922 14.597656 L 18.246094 14.945312 L 18.367188 15.166016 L 18.623047 15.150391 L 18.986328 15.019531 L 18.96875 14.871094 L 19.013672 14.886719 L 19.357422 14.623047 L 19.376953 14.164062 L 18.912109 13.888672 z M 21.445312 13.179688 L 20.923828 13.300781 L 20.882812 13.804688 L 21.339844 13.996094 L 21.724609 13.617188 L 21.445312 13.179688 z M 4.3652344 13.292969 L 4.0175781 13.494141 L 3.9472656 13.841797 L 4.0039062 14.199219 L 4.4394531 14.208984 L 4.5507812 13.966797 L 4.8085938 13.753906 L 4.7128906 13.398438 L 4.3652344 13.292969 z M 11.808594 13.294922 L 11.501953 13.5 L 11.363281 13.857422 L 11.652344 14.240234 L 12.019531 14.28125 L 12.347656 14.166016 L 12.443359 13.755859 L 12.298828 13.304688 L 11.808594 13.294922 z M 27.378906 13.378906 L 27.142578 13.439453 L 26.923828 13.755859 L 27.115234 14.015625 L 27.455078 14.107422 L 27.6875 14.013672 L 27.705078 13.757812 L 27.617188 13.378906 L 27.378906 13.378906 z M 28.794922 13.5625 L 28.355469 13.755859 L 28.212891 14.240234 L 28.638672 14.662109 L 29.166016 14.404297 L 29.253906 13.861328 L 28.794922 13.5625 z M 20.066406 13.771484 L 19.751953 14.021484 L 19.71875 14.462891 L 19.988281 14.744141 L 20.349609 14.914062 L 20.628906 14.527344 L 20.480469 14.277344 L 20.445312 13.910156 L 20.066406 13.771484 z M 10.787109 13.955078 L 10.259766 14.134766 L 10.21875 14.740234 L 10.78125 14.900391 L 11.128906 14.408203 L 10.787109 13.955078 z M 3.5097656 14.195312 L 3.1601562 14.763672 L 3.625 15.205078 L 4.2148438 14.90625 L 4.1132812 14.291016 L 3.5097656 14.195312 z M 21.541016 14.205078 L 21.035156 14.439453 L 21.082031 14.984375 L 21.527344 15.240234 L 21.849609 15.001953 L 21.798828 15.355469 L 21.919922 15.59375 L 21.757812 15.802734 L 21.751953 15.712891 L 21.427734 15.574219 L 21.148438 15.666016 L 21.128906 15.710938 L 20.697266 15.640625 L 20.496094 15.902344 L 20.207031 15.517578 L 19.724609 15.683594 L 19.685547 16.238281 L 20.201172 16.382812 L 20.386719 16.123047 L 20.654297 16.541016 L 21.167969 16.5625 L 21.287109 16.310547 L 21.542969 16.292969 L 21.775391 16.107422 L 21.771484 16.035156 L 21.980469 16.359375 L 22.494141 16.378906 L 22.716797 15.917969 L 22.613281 15.738281 L 22.824219 15.798828 L 22.978516 15.617188 L 23 15.849609 L 23.121094 15.919922 L 22.994141 16.359375 L 23.417969 16.695312 L 23.818359 16.365234 L 23.748047 16.171875 L 23.808594 16.234375 L 24.097656 16.371094 L 24.212891 16.210938 L 24.447266 16.277344 L 24.658203 16.03125 L 24.630859 15.949219 L 24.796875 16.105469 L 24.984375 16.03125 L 25.001953 16.119141 L 25.208984 16.322266 L 25.585938 16.253906 L 25.681641 15.923828 L 25.558594 15.667969 L 25.205078 15.552734 L 25.126953 15.630859 L 24.939453 15.384766 L 24.628906 15.359375 L 24.320312 15.449219 L 24.337891 15.619141 L 24.238281 15.572266 L 24.179688 15.597656 L 24.177734 15.564453 L 23.873047 15.455078 L 23.814453 15.5 L 23.808594 15.371094 L 23.443359 15.09375 L 22.966797 15.3125 L 22.941406 15.230469 L 22.609375 15.072266 L 22.501953 15.119141 L 22.486328 15.039062 L 22.191406 14.933594 L 21.857422 14.996094 L 21.939453 14.935547 L 21.917969 14.490234 L 21.541016 14.205078 z M 13.759766 14.246094 L 13.513672 14.423828 L 13.376953 14.732422 L 13.634766 14.96875 L 13.896484 15.003906 L 14.138672 14.876953 L 14.166016 14.537109 L 13.988281 14.341797 L 13.759766 14.246094 z M 30.177734 14.253906 L 29.789062 14.285156 L 29.566406 14.517578 L 29.583984 14.939453 L 29.964844 15.113281 L 30.269531 14.925781 L 30.402344 14.625 L 30.177734 14.253906 z M 4.9296875 14.326172 L 4.546875 14.4375 L 4.59375 14.910156 L 4.8710938 14.998047 L 5.1367188 15.25 L 5.5117188 15.103516 L 5.5800781 14.708984 L 5.3144531 14.357422 L 4.9296875 14.326172 z M 26.896484 14.367188 L 26.742188 14.585938 L 26.650391 14.84375 L 26.802734 15.251953 L 27.166016 15.240234 L 27.466797 14.982422 L 27.529297 14.707031 L 27.302734 14.527344 L 26.896484 14.367188 z M 28.115234 14.601562 L 27.736328 14.722656 L 27.517578 15.013672 L 27.660156 15.474609 L 28.085938 15.546875 L 28.388672 15.353516 L 28.480469 14.892578 L 28.115234 14.601562 z M 11.933594 14.615234 L 11.623047 14.703125 L 11.417969 14.988281 L 11.421875 15.240234 L 11.65625 15.345703 L 11.988281 15.390625 L 11.908203 15.425781 L 11.792969 15.822266 L 11.59375 15.560547 L 11.318359 15.537109 L 11.363281 15.470703 L 11.318359 15.089844 L 11.003906 15.021484 L 10.6875 15.179688 L 10.576172 15.404297 L 10.664062 15.517578 L 10.371094 15.666016 L 10.244141 15.896484 L 10.263672 16.072266 L 10.259766 16.070312 L 9.9941406 16.257812 L 10.019531 16.580078 L 10.294922 16.804688 L 10.603516 16.753906 L 10.880859 16.59375 L 10.759766 16.248047 L 10.830078 16.21875 L 11.001953 16.039062 L 10.923828 15.746094 L 10.914062 15.736328 L 10.992188 15.791016 L 11.013672 16.005859 L 11.236328 16.078125 L 11.246094 16.085938 L 11.132812 16.167969 L 11.15625 16.488281 L 11.431641 16.712891 L 11.740234 16.662109 L 12.017578 16.501953 L 11.888672 16.140625 L 11.759766 16.132812 L 11.800781 15.888672 L 12.164062 16.246094 L 12.335938 16.162109 L 12.365234 16.347656 L 12.625 16.585938 L 12.875 16.611328 L 13.007812 16.392578 L 13.039062 16.273438 L 13.064453 16.3125 L 13.556641 16.238281 L 13.736328 15.845703 L 13.542969 15.429688 L 13.095703 15.40625 L 13.316406 15.263672 L 13.222656 14.732422 L 12.703125 14.714844 L 12.505859 15.210938 L 12.898438 15.53125 L 12.964844 15.488281 L 12.800781 15.884766 L 12.667969 15.853516 L 12.722656 15.523438 L 12.304688 15.253906 L 12.052734 15.363281 L 12.126953 15.175781 L 12.152344 14.933594 L 11.933594 14.615234 z M 2.2988281 14.626953 L 2.1035156 14.964844 L 2.1679688 15.283203 L 2.5292969 15.507812 L 2.8925781 15.291016 L 2.9101562 14.933594 L 2.7363281 14.654297 L 2.2988281 14.626953 z M 16.191406 14.800781 L 15.945312 15.037109 L 15.949219 15.300781 L 16.056641 15.525391 L 16.357422 15.554688 L 16.666016 15.414062 L 16.628906 15.066406 L 16.457031 14.867188 L 16.191406 14.800781 z M 7.7753906 15.017578 L 7.5058594 15.445312 L 7.8203125 15.828125 L 8.109375 15.740234 L 8.2050781 16.003906 L 8.4199219 16.15625 L 8.6933594 16.158203 L 8.8769531 15.869141 L 8.8105469 15.613281 L 8.6503906 15.423828 L 8.3515625 15.464844 L 8.3222656 15.488281 L 8.2929688 15.152344 L 7.7753906 15.017578 z M 26.158203 15.0625 L 25.751953 15.402344 L 25.789062 15.898438 L 26.015625 15.976562 L 26.046875 16.275391 L 26.269531 16.347656 L 26.484375 16.550781 L 26.503906 16.542969 L 26.310547 16.710938 L 26.367188 17.048828 L 26.585938 17.195312 L 26.832031 17.232422 L 27.027344 17.003906 L 27.085938 16.669922 L 26.779297 16.501953 L 26.541016 16.529297 L 26.787109 16.431641 L 26.816406 16.257812 L 26.855469 16.380859 L 27.195312 16.4375 L 27.435547 16.285156 L 27.507812 15.919922 L 27.21875 15.6875 L 26.917969 15.787109 L 26.755859 15.998047 L 26.626953 15.830078 L 26.564453 15.824219 L 26.601562 15.796875 L 26.623047 15.339844 L 26.158203 15.0625 z M 9.7109375 15.126953 L 9.4394531 15.554688 L 9.5351562 15.671875 L 9.4921875 15.667969 L 9.1835938 15.757812 L 9.2070312 15.990234 L 9.0996094 16.044922 L 8.9199219 16.208984 L 8.8769531 16.564453 L 8.71875 16.466797 L 8.2832031 16.611328 L 8.1894531 17.142578 L 8.6523438 17.404297 L 9.1015625 17.191406 L 9.0859375 16.695312 L 9.1621094 16.732422 L 9.5058594 16.654297 L 9.6699219 16.462891 L 9.6386719 16.394531 L 9.6601562 16.414062 L 9.9628906 16.294922 L 10.017578 15.976562 L 9.9433594 15.880859 L 10.273438 15.779297 L 10.228516 15.261719 L 9.7109375 15.126953 z M 0.3125 15.138672 L 0.04296875 15.228516 L 0 15.320312 L 0 16.322266 L 0.13085938 16.298828 L 0.16992188 16.164062 L 0.30664062 16.03125 L 0.29882812 15.845703 L 0.42382812 15.835938 L 0.6484375 15.658203 L 0.63476562 15.691406 L 0.73828125 15.828125 L 0.703125 16.009766 L 0.52734375 16.248047 L 0.66796875 16.507812 L 0.67773438 16.646484 L 0.95507812 16.871094 L 1.2421875 16.822266 L 1.2910156 16.974609 L 1.8222656 16.992188 L 2.1210938 16.59375 L 2.0097656 16.394531 L 2.1113281 16.441406 L 2.4941406 16.494141 L 2.5820312 16.271484 L 2.5859375 16.226562 L 2.6816406 16.441406 L 3.1113281 16.351562 L 3.0957031 16.449219 L 3.5664062 16.705078 L 3.9296875 16.353516 L 3.875 16.238281 L 3.9589844 16.285156 L 3.9316406 16.333984 L 3.9628906 16.607422 L 4.2734375 16.753906 L 4.5175781 16.65625 L 4.6894531 16.476562 L 4.6601562 16.363281 L 4.796875 16.582031 L 5.2890625 16.507812 L 5.4707031 16.115234 L 5.2753906 15.699219 L 4.7363281 15.669922 L 4.546875 16.121094 L 4.4140625 15.988281 L 4.4179688 15.984375 L 4.2011719 15.539062 L 3.6621094 15.568359 L 3.6074219 15.914062 L 3.2441406 15.933594 L 3.2617188 15.804688 L 2.8046875 15.587891 L 2.5136719 15.894531 L 2.3886719 15.712891 L 2.078125 15.798828 L 1.8730469 16.083984 L 1.875 16.160156 L 1.4453125 16.130859 L 1.2929688 16.289062 L 1.2597656 16.287109 L 1.2460938 15.990234 L 1.2285156 15.949219 L 1.3378906 15.912109 L 1.4042969 15.617188 L 1.3027344 15.294922 L 0.953125 15.289062 L 0.734375 15.435547 L 0.65039062 15.652344 L 0.62695312 15.273438 L 0.3125 15.138672 z M 6.3027344 15.160156 L 6.0566406 15.183594 L 5.9550781 15.384766 L 5.9023438 15.384766 L 5.6679688 15.445312 L 5.4472656 15.761719 L 5.6386719 16.021484 L 5.9785156 16.113281 L 6.2128906 16.019531 L 6.2226562 15.865234 L 6.28125 15.880859 L 6.328125 15.863281 L 6.3125 15.978516 L 6.3457031 16.21875 L 6.6328125 16.474609 L 6.7636719 16.400391 L 6.765625 16.404297 L 6.8085938 16.679688 L 7.0683594 16.919922 L 7.3183594 16.945312 L 7.4511719 16.724609 L 7.4726562 16.644531 L 7.7304688 16.6875 L 7.9707031 16.535156 L 8.0429688 16.169922 L 7.7558594 15.939453 L 7.5175781 16.017578 L 7.2675781 15.605469 L 6.7832031 15.708984 L 6.7285156 15.699219 L 6.5820312 15.714844 L 6.6855469 15.566406 L 6.5507812 15.25 L 6.3027344 15.160156 z M 29.056641 15.210938 L 28.8125 15.285156 L 28.490234 15.5 L 28.533203 15.617188 L 28.400391 15.617188 L 28.335938 15.804688 L 28.103516 15.738281 L 27.785156 16.119141 L 27.908203 16.533203 L 28.330078 16.714844 L 28.753906 16.378906 L 28.734375 16.324219 L 28.84375 16.259766 L 29.070312 16.011719 L 29.087891 16.015625 L 29.263672 15.746094 L 29.228516 15.394531 L 29.056641 15.210938 z M 15.025391 15.271484 L 14.779297 15.509766 L 14.78125 15.650391 L 14.486328 15.740234 L 14.458984 15.667969 L 13.955078 15.689453 L 13.818359 16.166016 L 14.09375 16.384766 L 13.878906 16.509766 L 13.978516 16.994141 L 14.511719 17.095703 L 14.667969 16.720703 L 14.78125 16.837891 L 15.070312 16.976562 L 15.294922 16.666016 L 15.175781 16.462891 L 15.148438 16.167969 L 15.087891 16.146484 L 15.091797 16.017578 L 15.191406 16.027344 L 15.5 15.886719 L 15.464844 15.539062 L 15.292969 15.339844 L 15.025391 15.271484 z M 32 15.320312 L 31.925781 15.480469 L 31.794922 15.509766 L 31.777344 15.603516 L 31.751953 15.595703 L 31.554688 15.789062 L 31.455078 15.734375 L 31.193359 15.761719 L 31.175781 15.777344 L 31.111328 15.539062 L 30.802734 15.445312 L 30.527344 15.603516 L 30.501953 15.492188 L 30.261719 15.492188 L 30.027344 15.552734 L 30.001953 15.589844 L 29.904297 15.623047 L 29.732422 15.484375 L 29.431641 15.580078 L 29.255859 15.808594 L 29.369141 16.175781 L 29.707031 16.230469 L 29.757812 16.199219 L 29.833984 16.296875 L 30.148438 16.275391 L 30.248047 16.195312 L 30.337891 16.220703 L 30.472656 16.167969 L 30.484375 16.246094 L 30.867188 16.255859 L 30.966797 16.041016 L 30.998047 16.015625 L 31.042969 16.28125 L 31.261719 16.427734 L 31.505859 16.464844 L 31.664062 16.279297 L 31.753906 16.367188 L 32 16.322266 L 32 15.320312 z M 19.318359 15.382812 L 18.988281 15.480469 L 18.871094 15.714844 L 18.863281 15.962891 L 19.046875 16.083984 L 18.822266 16.1875 L 18.751953 16.564453 L 19.025391 16.769531 L 19.308594 16.748047 L 19.542969 16.457031 L 19.40625 16.144531 L 19.451172 16.146484 L 19.582031 15.822266 L 19.521484 15.566406 L 19.318359 15.382812 z M 18.294922 15.447266 L 17.898438 15.621094 L 17.869141 15.722656 L 17.759766 15.539062 L 17.306641 15.462891 L 17.029297 15.820312 L 16.976562 15.802734 L 16.724609 16.003906 L 16.697266 16.357422 L 16.914062 16.582031 L 17.203125 16.720703 L 17.427734 16.410156 L 17.388672 16.34375 L 17.761719 16.357422 L 17.861328 16.152344 L 18.154297 16.441406 L 18.630859 16.208984 L 18.710938 15.716797 L 18.294922 15.447266 z M 15.742188 15.980469 L 15.560547 16.160156 L 15.375 16.5 L 15.552734 16.660156 L 15.763672 16.765625 L 15.808594 17.248047 L 16.238281 17.496094 L 16.640625 17.203125 L 16.617188 16.769531 L 16.251953 16.492188 L 16.158203 16.535156 L 16.173828 16.357422 L 15.980469 16.064453 L 15.742188 15.980469 z M 30.779297 16.271484 L 30.457031 16.316406 L 30.328125 16.611328 L 30.46875 16.939453 L 30.765625 17.037109 L 31.083984 17.023438 L 31.138672 16.644531 L 30.939453 16.521484 L 30.779297 16.271484 z M 17.71875 16.451172 L 17.515625 16.597656 L 17.560547 16.851562 L 17.734375 17.197266 L 17.966797 17.140625 L 18.181641 17.023438 L 18.318359 16.664062 L 18.070312 16.458984 L 17.71875 16.451172 z M 22.019531 16.458984 L 21.806641 16.570312 L 21.626953 16.734375 L 21.580078 17.115234 L 21.869141 17.257812 L 22.212891 17.179688 L 22.375 16.988281 L 22.271484 16.753906 L 22.019531 16.458984 z M 24.986328 16.490234 L 24.771484 16.642578 L 24.648438 16.859375 L 24.794922 17.125 L 25.085938 17.296875 L 25.351562 17.070312 L 25.417969 16.816406 L 25.322266 16.558594 L 24.986328 16.490234 z M 29.853516 16.503906 L 29.59375 16.539062 L 29.384766 16.673828 L 29.390625 16.974609 L 29.550781 17.238281 L 29.519531 17.496094 L 29.808594 17.636719 L 30.085938 17.576172 L 30.064453 17.689453 L 30.337891 17.896484 L 30.621094 17.873047 L 30.855469 17.582031 L 30.707031 17.244141 L 30.394531 17.191406 L 30.263672 17.251953 L 30.210938 17.134766 L 30.085938 16.988281 L 30.121094 16.71875 L 29.853516 16.503906 z M 0 16.675781 L 0 17.433594 L 0.04296875 17.486328 L 0.56054688 17.328125 L 0.515625 16.810547 L 0 16.675781 z M 31.998047 16.675781 L 31.728516 17.103516 L 32 17.433594 L 32 16.675781 L 31.998047 16.675781 z M 10.541016 16.96875 L 10.087891 17.359375 L 10.310547 17.876953 L 10.861328 17.832031 L 11.044922 17.255859 L 10.541016 16.96875 z M 5.5410156 17.048828 L 5.2128906 17.144531 L 5.09375 17.378906 L 5.0859375 17.628906 L 5.3378906 17.794922 L 5.6757812 17.8125 L 5.8046875 17.488281 L 5.7460938 17.232422 L 5.5410156 17.048828 z M 27.732422 17.058594 L 27.462891 17.396484 L 27.552734 17.845703 L 28.070312 18.003906 L 28.384766 17.576172 L 28.226562 17.103516 L 27.732422 17.058594 z M 13.775391 17.117188 L 13.316406 17.310547 L 13.232422 17.746094 L 13.521484 18.109375 L 14.052734 18.007812 L 14.132812 17.470703 L 13.775391 17.117188 z M 13.521484 18.109375 L 13.207031 18.267578 L 13.09375 18.492188 L 13.251953 18.695312 L 13.566406 18.919922 L 13.746094 18.761719 L 13.882812 18.560547 L 13.835938 18.177734 L 13.521484 18.109375 z M 3.1640625 17.25 L 2.8671875 17.628906 L 3.0527344 18.019531 L 3.3808594 18.160156 L 3.8105469 17.972656 L 3.84375 17.511719 L 3.5292969 17.267578 L 3.1640625 17.25 z M 2.0410156 17.298828 L 1.8222656 17.445312 L 1.7226562 17.701172 L 1.9296875 17.974609 L 2.1914062 18.003906 L 2.4257812 17.921875 L 2.4921875 17.628906 L 2.390625 17.306641 L 2.0410156 17.298828 z M 12.785156 17.494141 L 12.279297 17.513672 L 11.998047 17.859375 L 11.853516 18.296875 L 12.332031 18.5625 L 12.599609 18.357422 L 13.009766 18.267578 L 13.113281 17.814453 L 12.785156 17.494141 z M 21.205078 17.648438 L 20.917969 17.773438 L 20.6875 17.994141 L 20.896484 18.314453 L 21.128906 18.273438 L 21.414062 18.353516 L 21.625 18.107422 L 21.525391 17.800781 L 21.205078 17.648438 z M 20.896484 18.314453 L 20.376953 18.425781 L 20.181641 18.884766 L 20.521484 19.246094 L 20.949219 19.171875 L 21.179688 18.775391 L 20.896484 18.314453 z M 19.753906 17.65625 L 19.232422 17.777344 L 19.191406 18.28125 L 19.648438 18.472656 L 20.033203 18.09375 L 19.753906 17.65625 z M 28.4375 17.798828 L 27.972656 18.074219 L 28.140625 18.566406 L 28.673828 18.574219 L 28.833984 18.09375 L 28.4375 17.798828 z M 26.904297 17.876953 L 26.537109 17.939453 L 26.423828 18.289062 L 26.621094 18.537109 L 26.896484 18.619141 L 27.199219 18.384766 L 27.130859 18.046875 L 26.904297 17.876953 z M 11 17.925781 L 10.857422 18.28125 L 11.021484 18.449219 L 11.117188 18.728516 L 11.439453 18.763672 L 11.636719 18.507812 L 11.578125 18.15625 L 11.314453 17.990234 L 11 17.925781 z M 4.3027344 18.294922 L 4.0625 18.417969 L 3.859375 18.601562 L 3.8066406 19.033203 L 4.1328125 19.191406 L 4.4414062 19.121094 L 4.5234375 19.337891 L 4.6660156 19.535156 L 5.0390625 19.628906 L 5.2148438 19.357422 L 5.1777344 19.007812 L 5.0078125 18.822266 L 4.7617188 18.898438 L 4.6054688 19.001953 L 4.703125 18.888672 L 4.5859375 18.623047 L 4.3027344 18.294922 z M 2.6992188 18.816406 L 2.3457031 18.914062 L 2.1132812 19.238281 L 2.1191406 19.523438 L 2.3828125 19.642578 L 2.8183594 19.703125 L 2.9179688 19.451172 L 2.9472656 19.175781 L 2.6992188 18.816406 z M 29.261719 18.820312 L 28.931641 18.917969 L 28.814453 19.152344 L 28.806641 19.400391 L 29.058594 19.566406 L 29.394531 19.583984 L 29.525391 19.259766 L 29.464844 19.003906 L 29.261719 18.820312 z M 10.966797 18.943359 L 10.705078 18.970703 L 10.498047 19.152344 L 10.554688 19.490234 L 10.773438 19.636719 L 11.019531 19.673828 L 11.214844 19.443359 L 11.273438 19.111328 L 10.966797 18.943359 z M 18.724609 18.974609 L 18.458984 19.162109 L 18.482422 19.484375 L 18.757812 19.708984 L 19.066406 19.658203 L 19.34375 19.498047 L 19.216797 19.136719 L 18.982422 19.119141 L 18.724609 18.974609 z M 27.964844 19.144531 L 27.478516 19.244141 L 27.373047 19.730469 L 27.675781 20.039062 L 28.132812 20.003906 L 28.351562 19.509766 L 27.964844 19.144531 z M 28.132812 20.003906 L 28.298828 20.496094 L 28.833984 20.503906 L 28.994141 20.023438 L 28.597656 19.726562 L 28.132812 20.003906 z M 21.441406 19.300781 L 21.091797 19.458984 L 21.076172 19.800781 L 21.255859 20.021484 L 21.626953 20.048828 L 21.822266 19.734375 L 21.689453 19.449219 L 21.441406 19.300781 z M 12.324219 19.576172 L 12.056641 19.640625 L 11.949219 19.964844 L 12.074219 20.197266 L 12.275391 20.34375 L 12.554688 20.232422 L 12.761719 19.962891 L 12.570312 19.671875 L 12.324219 19.576172 z M 20.273438 19.929688 L 20.060547 20.039062 L 19.880859 20.203125 L 19.833984 20.585938 L 20.123047 20.726562 L 20.466797 20.648438 L 20.630859 20.457031 L 20.525391 20.222656 L 20.273438 19.929688 z M 3.2890625 20.041016 L 3.0722656 20.214844 L 3.046875 20.519531 L 3.234375 20.712891 L 3.484375 20.832031 L 3.6777344 20.564453 L 3.5742188 20.388672 L 3.5507812 20.134766 L 3.2890625 20.041016 z M 27.648438 20.625 L 27.349609 20.667969 L 27.083984 20.876953 L 27.201172 21.207031 L 27.416016 21.359375 L 27.691406 21.361328 L 27.873047 21.070312 L 27.806641 20.816406 L 27.648438 20.625 z M 11.916016 20.994141 L 11.412109 21.015625 L 11.275391 21.492188 L 11.699219 21.828125 L 12.099609 21.498047 L 11.916016 20.994141 z M 13.189453 21.070312 L 12.876953 21.228516 L 12.75 21.458984 L 12.78125 21.732422 L 13.091797 21.878906 L 13.335938 21.78125 L 13.507812 21.601562 L 13.429688 21.308594 L 13.189453 21.070312 z M 20.748047 21.193359 L 20.416016 21.621094 L 20.705078 22.068359 L 21.203125 22.087891 L 21.419922 21.640625 L 21.201172 21.269531 L 20.748047 21.193359 z M 28.638672 21.195312 L 28.337891 21.292969 L 28.162109 21.521484 L 28.275391 21.886719 L 28.615234 21.943359 L 28.855469 21.791016 L 28.927734 21.425781 L 28.638672 21.195312 z M 4.0332031 21.414062 L 3.7871094 21.435547 L 3.6523438 21.707031 L 3.6738281 22.042969 L 4.0117188 22.132812 L 4.2597656 22.042969 L 4.4160156 21.818359 L 4.28125 21.503906 L 4.0332031 21.414062 z M 20.050781 22.527344 L 19.845703 22.810547 L 19.841797 23.074219 L 19.998047 23.300781 L 20.339844 23.287109 L 20.511719 23.085938 L 20.578125 22.847656 L 20.373047 22.625 L 20.050781 22.527344 z M 12.490234 22.582031 L 12.148438 22.759766 L 12.197266 23.078125 L 12.457031 23.316406 L 12.707031 23.341797 L 12.839844 23.123047 L 12.939453 22.748047 L 12.728516 22.636719 L 12.490234 22.582031 z M 29.103516 24.429688 L 28.736328 24.492188 L 28.623047 24.84375 L 28.820312 25.089844 L 29.095703 25.173828 L 29.398438 24.9375 L 29.332031 24.601562 L 29.103516 24.429688 z M 4.0605469 25.792969 L 3.9570312 26.007812 L 4.0390625 26.232422 L 4.2890625 26.242188 L 4.4003906 26.017578 L 4.2890625 25.832031 L 4.0605469 25.792969 z M 19.880859 26.054688 L 19.742188 26.388672 L 19.923828 26.673828 L 20.257812 26.623047 L 20.382812 26.355469 L 20.25 26.074219 L 19.880859 26.054688 z M 11.601562 26.5625 L 11.333984 26.785156 L 11.359375 27.111328 L 11.667969 27.216797 L 11.892578 27.042969 L 11.90625 26.744141 L 11.601562 26.5625 z M 27.898438 28.8125 L 27.775391 29.025391 L 27.816406 29.224609 L 28.042969 29.5 L 28.269531 29.361328 L 28.28125 29.005859 L 28.171875 28.830078 L 27.898438 28.8125 z " + style="fill:#999999;fill-opacity:1;stroke:none" /> + y="0" + x="0" + rx="0" + height="32" + width="32" /> Created with Snap + id="desc907">Created with Snap diff --git a/symbols/arete2.svg b/symbols/arete2.svg deleted file mode 100644 index 28a723ae99..0000000000 --- a/symbols/arete2.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/ridge-lz.svg b/symbols/ridge-lz.svg deleted file mode 100644 index dda7e5793d..0000000000 --- a/symbols/ridge-lz.svg +++ /dev/null @@ -1,582 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Created with Snap - diff --git a/symbols/ridge-mz.svg b/symbols/ridge-mz.svg deleted file mode 100644 index 7d94f14a4e..0000000000 --- a/symbols/ridge-mz.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - Created with Snap - From ad58ed22dac6bf9661efb409b924a0e4c4267ff0 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 27 Feb 2020 17:32:20 +0900 Subject: [PATCH 10/12] Add missing ridge-mid.svg file --- symbols/ridge-mid.svg | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 symbols/ridge-mid.svg diff --git a/symbols/ridge-mid.svg b/symbols/ridge-mid.svg new file mode 100644 index 0000000000..7d94f14a4e --- /dev/null +++ b/symbols/ridge-mid.svg @@ -0,0 +1,65 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + From 036096c0f2f447ce7355b3f124b4ebd0f97163e3 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 20 Mar 2020 14:48:26 +0900 Subject: [PATCH 11/12] Change arete.svg to arete2.svg and rename ridge to ridge2 --- style/landcover.mss | 4 +- symbols/arete.svg | 40 ----------------- symbols/arete2.svg | 74 +++++++++++++++++++++++++++++++ symbols/{ridge.svg => ridge2.svg} | 0 4 files changed, 76 insertions(+), 42 deletions(-) delete mode 100644 symbols/arete.svg create mode 100644 symbols/arete2.svg rename symbols/{ridge.svg => ridge2.svg} (100%) diff --git a/style/landcover.mss b/style/landcover.mss index abd2684657..78137325ca 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -825,13 +825,13 @@ [natural = 'ridge'][zoom >= 14] { line-pattern-file: url('symbols/ridge-mid.svg'); [zoom >= 15] { - line-pattern-file: url('symbols/ridge.svg'); + line-pattern-file: url('symbols/ridge2.svg'); } } [natural = 'arete'][zoom >= 14] { line-pattern-file: url('symbols/arete-mid.svg'); [zoom >= 15] { - line-pattern-file: url('symbols/arete.svg'); + line-pattern-file: url('symbols/arete2.svg'); } } [man_made = 'embankment'][zoom >= 15]::man_made { diff --git a/symbols/arete.svg b/symbols/arete.svg deleted file mode 100644 index b6b00d75e6..0000000000 --- a/symbols/arete.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - Created with Snap - diff --git a/symbols/arete2.svg b/symbols/arete2.svg new file mode 100644 index 0000000000..b45f49527e --- /dev/null +++ b/symbols/arete2.svg @@ -0,0 +1,74 @@ + + + + + + + image/svg+xml + + + + + + + + Created with Snap + + diff --git a/symbols/ridge.svg b/symbols/ridge2.svg similarity index 100% rename from symbols/ridge.svg rename to symbols/ridge2.svg From cd13061e7f3c9edaff9ba622c9e578d18b7936db Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Fri, 20 Mar 2020 19:08:40 +0900 Subject: [PATCH 12/12] Clean up arete svg files --- symbols/arete-mid.svg | 14 -------------- symbols/arete2.svg | 40 +--------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/symbols/arete-mid.svg b/symbols/arete-mid.svg index 2f0f7fd32f..a23d320fbd 100644 --- a/symbols/arete-mid.svg +++ b/symbols/arete-mid.svg @@ -9,18 +9,6 @@ height="32" width="32" id="Svg"> - - - - image/svg+xml - - - - - - Created with Snap diff --git a/symbols/arete2.svg b/symbols/arete2.svg index b45f49527e..6b95f600bf 100644 --- a/symbols/arete2.svg +++ b/symbols/arete2.svg @@ -5,48 +5,10 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" height="32" width="32" - id="Svg" - inkscape:version="0.91 r13725" - sodipodi:docname="arete_x4.svg"> - - - - - image/svg+xml - - - - + id="Svg">