You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by le...@apache.org on 2023/06/15 11:16:04 UTC
[incubator-baremaps] branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer updated (c4445c33 -> 5e9b8338)
This is an automated email from the ASF dual-hosted git repository.
leonardcs pushed a change to branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
from c4445c33 Support FTP downloads and extend IRR whois source files (#698)
new 16a535e9 Fix layering for parks with natural and landuse
new cf138cb8 Hide hidden buildings
new 88f5b897 Hide underground parkings
new 5e9b8338 Add new tests for parks
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
basemap/layers/amenity/overlay.js | 7 +++-
basemap/layers/building/shape.js | 1 +
basemap/layers/landuse/background.js | 4 ---
basemap/layers/landuse/overlay.js | 4 +++
basemap/layers/leisure/background.js | 40 +++-------------------
basemap/layers/leisure/overlay.js | 37 ++++++++++++++++++++
basemap/layers/natural/background.js | 4 +++
basemap/layers/natural/overlay.js | 20 ++++++-----
basemap/style.js | 4 +--
.../metadata.json | 2 +-
.../metadata.json | 2 +-
.../tests/integration/park3-london/metadata.json | 8 +++++
12 files changed, 80 insertions(+), 53 deletions(-)
copy basemap/tests/integration/{automotive-testing-papenburg-germany => park1-london}/metadata.json (60%)
copy basemap/tests/integration/{automotive-testing-papenburg-germany => park2-london}/metadata.json (60%)
create mode 100644 basemap/tests/integration/park3-london/metadata.json
[incubator-baremaps] 04/04: Add new tests for parks
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonardcs pushed a commit to branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 5e9b83382b3f8122936bf71251ea1034a124fc55
Author: Leonard <le...@gmail.com>
AuthorDate: Thu Jun 15 13:15:59 2023 +0200
Add new tests for parks
---
basemap/tests/integration/park1-london/metadata.json | 6 ++++++
basemap/tests/integration/park2-london/metadata.json | 6 ++++++
basemap/tests/integration/park3-london/metadata.json | 8 ++++++++
3 files changed, 20 insertions(+)
diff --git a/basemap/tests/integration/park1-london/metadata.json b/basemap/tests/integration/park1-london/metadata.json
new file mode 100644
index 00000000..9a8f3621
--- /dev/null
+++ b/basemap/tests/integration/park1-london/metadata.json
@@ -0,0 +1,6 @@
+{
+ "width": 512,
+ "height": 512,
+ "center": [-0.33875, 51.41061],
+ "zoom": 13.25
+}
diff --git a/basemap/tests/integration/park2-london/metadata.json b/basemap/tests/integration/park2-london/metadata.json
new file mode 100644
index 00000000..ade8d536
--- /dev/null
+++ b/basemap/tests/integration/park2-london/metadata.json
@@ -0,0 +1,6 @@
+{
+ "width": 512,
+ "height": 512,
+ "center": [-0.27689, 51.44093],
+ "zoom": 13.25
+}
diff --git a/basemap/tests/integration/park3-london/metadata.json b/basemap/tests/integration/park3-london/metadata.json
new file mode 100644
index 00000000..318ee742
--- /dev/null
+++ b/basemap/tests/integration/park3-london/metadata.json
@@ -0,0 +1,8 @@
+{
+ "issue": "https://github.com/apache/incubator-baremaps/issues/695",
+ "width": 512,
+ "height": 512,
+ "center": [-0.17321, 51.50459],
+ "zoom": 13.25
+
+}
[incubator-baremaps] 03/04: Hide underground parkings
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonardcs pushed a commit to branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 88f5b89770804ebfb9d790d0cea44bf58e04a486
Author: Leonard <le...@gmail.com>
AuthorDate: Thu Jun 15 13:04:17 2023 +0200
Hide underground parkings
---
basemap/layers/amenity/overlay.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/basemap/layers/amenity/overlay.js b/basemap/layers/amenity/overlay.js
index e7c77fd1..0ce02272 100644
--- a/basemap/layers/amenity/overlay.js
+++ b/basemap/layers/amenity/overlay.js
@@ -17,8 +17,13 @@ let directives = [
'fill-color': 'rgb(238, 238, 238)',
},
{
- filter: ['==', ['get', 'amenity'], 'parking'],
+ filter: [
+ 'all',
+ ['!=', ['get', 'layer'], '-1'],
+ ['==', ['get', 'amenity'], 'parking']
+ ],
'fill-color': 'rgb(238, 238, 238)',
+ 'fill-outline-color': 'rgb(205, 203, 199)'
},
];
[incubator-baremaps] 01/04: Fix layering for parks with natural and landuse
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonardcs pushed a commit to branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 16a535e946ffa516881fdbbfb1d370cbc55c60dd
Author: Leonard <le...@gmail.com>
AuthorDate: Thu Jun 15 13:03:29 2023 +0200
Fix layering for parks with natural and landuse
---
basemap/layers/landuse/background.js | 4 ----
basemap/layers/landuse/overlay.js | 4 ++++
basemap/layers/leisure/background.js | 40 ++++--------------------------------
basemap/layers/leisure/overlay.js | 37 +++++++++++++++++++++++++++++++++
basemap/layers/natural/background.js | 4 ++++
basemap/layers/natural/overlay.js | 20 ++++++++++--------
basemap/style.js | 4 ++--
7 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/basemap/layers/landuse/background.js b/basemap/layers/landuse/background.js
index 02bf5af1..a26aaa5d 100644
--- a/basemap/layers/landuse/background.js
+++ b/basemap/layers/landuse/background.js
@@ -72,10 +72,6 @@ let directives = [
filter: ['==', ['get', 'landuse'], 'vineyard'],
'fill-color': 'rgb(172, 225, 161)',
},
- {
- filter: ['==', ['get', 'landuse'], 'meadow'],
- 'fill-color': 'rgb(205, 235, 176)',
- },
{
filter: ['==', ['get', 'landuse'], 'farmyard'],
'fill-color': 'rgb(238, 213, 179)',
diff --git a/basemap/layers/landuse/overlay.js b/basemap/layers/landuse/overlay.js
index d57bd0db..2e17c708 100644
--- a/basemap/layers/landuse/overlay.js
+++ b/basemap/layers/landuse/overlay.js
@@ -28,6 +28,10 @@ let directives = [
filter: ['==', ['get', 'landuse'], 'orchard'],
'fill-color': 'rgb(172, 225, 161)',
},
+ {
+ filter: ['==', ['get', 'landuse'], 'meadow'],
+ 'fill-color': 'rgb(205, 235, 176)',
+ },
];
export default asLayerObject(withFillSortKey(directives), {
diff --git a/basemap/layers/leisure/background.js b/basemap/layers/leisure/background.js
index 8f09feb9..8fb2fa68 100644
--- a/basemap/layers/leisure/background.js
+++ b/basemap/layers/leisure/background.js
@@ -12,41 +12,9 @@
import {asLayerObject, withSortKeys} from "../../utils/utils.js";
let directives = [
- {
- filter: ['==', ['get', 'leisure'], 'swimming_pool'],
- 'fill-color': 'rgb(170, 211, 223)',
- 'fill-outline-color': 'rgb(120, 183, 202)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'miniature_golf'],
- 'fill-color': 'rgb(181, 226, 181)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'ice_rink'],
- 'fill-color': 'rgb(221, 236, 236)',
- 'fill-outline-color': 'rgb(140, 220, 189)',
- },
{
filter: ['==', ['get', 'leisure'], 'golf_course'],
- 'fill-color': 'rgb(181, 226, 181)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'garden'],
- 'fill-color': 'rgb(205, 235, 176)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'dog_park'],
- 'fill-color': 'rgb(224, 252, 227)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'playground'],
- 'fill-color': 'rgb(223, 252, 226)',
- 'fill-outline-color': 'rgb(164, 221, 169)',
- },
- {
- filter: ['==', ['get', 'leisure'], 'pitch'],
- 'fill-color': 'rgb(170, 224, 203)',
- 'fill-outline-color': 'rgb(151, 212, 186)',
+ 'fill-color': 'rgb(221, 246, 192)',
},
{
filter: ['==', ['get', 'leisure'], 'track'],
@@ -58,8 +26,8 @@ let directives = [
'fill-color': 'rgb(223, 252, 226)',
},
{
- filter: ['==', ['get', 'leisure'], 'stadium'],
- 'fill-color': 'rgb(223, 252, 226)',
+ filter: ['==', ['get', 'leisure'], 'garden'],
+ 'fill-color': 'rgb(205, 235, 176)',
},
{
filter: ['==', ['get', 'leisure'], 'park'],
@@ -72,7 +40,7 @@ export default asLayerObject(withSortKeys(directives), {
type: 'fill',
source: 'baremaps',
'source-layer': 'leisure',
- filter: ['==', ['geometry-type'], 'Polygon'],
+ // filter: ['==', ['geometry-type'], 'Polygon'],
layout: {
visibility: 'visible',
},
diff --git a/basemap/layers/leisure/overlay.js b/basemap/layers/leisure/overlay.js
index 67df0935..1903be1f 100644
--- a/basemap/layers/leisure/overlay.js
+++ b/basemap/layers/leisure/overlay.js
@@ -17,6 +17,43 @@ let directives = [
'fill-color': 'rgb(181, 208, 208)',
'fill-outline-color': 'rgb(164, 187, 212)',
},
+ {
+ filter: ['==', ['get', 'leisure'], 'swimming_pool'],
+ 'fill-color': 'rgb(170, 211, 223)',
+ 'fill-outline-color': 'rgb(120, 183, 202)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'fitness_station'],
+ 'fill-color': 'rgb(223, 252, 226)',
+ 'fill-outline-color': 'rgb(164, 221, 169)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'miniature_golf'],
+ 'fill-color': 'rgb(181, 226, 181)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'ice_rink'],
+ 'fill-color': 'rgb(221, 236, 236)',
+ 'fill-outline-color': 'rgb(140, 220, 189)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'dog_park'],
+ 'fill-color': 'rgb(224, 252, 227)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'playground'],
+ 'fill-color': 'rgb(223, 252, 226)',
+ 'fill-outline-color': 'rgb(164, 221, 169)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'pitch'],
+ 'fill-color': 'rgb(170, 224, 203)',
+ 'fill-outline-color': 'rgb(151, 212, 186)',
+ },
+ {
+ filter: ['==', ['get', 'leisure'], 'stadium'],
+ 'fill-color': 'rgb(223, 252, 226)',
+ },
];
export default asLayerObject(withSortKeys(directives), {
diff --git a/basemap/layers/natural/background.js b/basemap/layers/natural/background.js
index 59241784..38ca5156 100644
--- a/basemap/layers/natural/background.js
+++ b/basemap/layers/natural/background.js
@@ -20,6 +20,10 @@ let directives = [
filter: ['==', ['get', 'natural'], 'wood'],
'fill-color': 'rgb(157, 202, 138)'
},
+ {
+ filter: ['==', ['get', 'natural'], 'scrub'],
+ 'fill-color': 'rgb(201, 216, 173)'
+ },
{
filter: ['==', ['get', 'natural'], 'heath'],
'fill-color': 'rgb(214, 217, 159)'
diff --git a/basemap/layers/natural/overlay.js b/basemap/layers/natural/overlay.js
index 571d0d29..475b15eb 100644
--- a/basemap/layers/natural/overlay.js
+++ b/basemap/layers/natural/overlay.js
@@ -12,6 +12,18 @@
import {asLayerObject, withSortKeys} from "../../utils/utils.js";
let directives = [
+ {
+ filter: ['==', ['get', 'natural'], 'wetland'],
+ 'fill-color': 'rgba(213, 231, 211, 0.5)'
+ },
+ {
+ filter: [
+ 'all',
+ ['==', ['get', 'natural'], 'beach'],
+ ['==', ['get', 'surface'], 'gravel']
+ ],
+ 'fill-color': 'rgb(171, 205, 214)'
+ },
{
filter: ['==', ['get', 'natural'], 'beach'],
'fill-color': 'rgb(255, 241, 186)'
@@ -20,10 +32,6 @@ let directives = [
filter: ['==', ['get', 'natural'], 'sand'],
'fill-color': 'rgb(240, 229, 196)'
},
- {
- filter: ['==', ['get', 'natural'], 'scrub'],
- 'fill-color': 'rgb(201, 216, 173)'
- },
{
filter: [
'all',
@@ -32,10 +40,6 @@ let directives = [
],
'fill-color': 'rgb(170, 211, 223)',
},
- {
- filter: ['==', ['get', 'natural'], 'wetland'],
- 'fill-color': 'rgb(213, 231, 211)'
- },
];
export default asLayerObject(withSortKeys(directives), {
diff --git a/basemap/style.js b/basemap/style.js
index a5ec7684..9bf6e4c0 100644
--- a/basemap/style.js
+++ b/basemap/style.js
@@ -78,9 +78,9 @@ export default {
power_background,
aeroway_polygon,
landuse_background,
- natural_background,
- amenity_background,
leisure_background,
+ amenity_background,
+ natural_background,
landuse_overlay,
natural_overlay,
amenity_overlay,
[incubator-baremaps] 02/04: Hide hidden buildings
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonardcs pushed a commit to branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit cf138cb8704847892be19d71e80de32a6a9f70a1
Author: Leonard <le...@gmail.com>
AuthorDate: Thu Jun 15 13:04:05 2023 +0200
Hide hidden buildings
---
basemap/layers/building/shape.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/basemap/layers/building/shape.js b/basemap/layers/building/shape.js
index ceea6ff2..4b81539a 100644
--- a/basemap/layers/building/shape.js
+++ b/basemap/layers/building/shape.js
@@ -14,6 +14,7 @@ export default {
type: 'fill',
source: 'baremaps',
'source-layer': 'building',
+ filter: ['!=', ['get', 'building'], 'no'],
layout: {
visibility: 'visible',
},