This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 3b0c8eb3 Add bus way and bus stop to basemap (#686)
3b0c8eb3 is described below
commit 3b0c8eb3068e1603880862a795304ed832eaa3f7
Author: Bertil Chapuis <[email protected]>
AuthorDate: Wed May 31 23:24:18 2023 +0200
Add bus way and bus stop to basemap (#686)
* Add bus way and bus stop to basemap
* Add integration test
---
basemap/layers/highway/highway_dash.js | 5 +++++
basemap/layers/highway/highway_line.js | 5 +++++
basemap/layers/highway/highway_outline.js | 6 ++++++
basemap/layers/point/icon.js | 6 ++++++
basemap/tests/integration/chateauneuf-bus/metadata.json | 7 +++++++
5 files changed, 29 insertions(+)
diff --git a/basemap/layers/highway/highway_dash.js
b/basemap/layers/highway/highway_dash.js
index f5e34a29..82d0d512 100644
--- a/basemap/layers/highway/highway_dash.js
+++ b/basemap/layers/highway/highway_dash.js
@@ -17,6 +17,11 @@ let directives = [
'line-color': 'rgb(68, 159, 66)',
'road-width': 1,
},
+ {
+ filter: ['==', ['get', 'highway'], 'busway'],
+ 'line-color': 'rgb(0, 146, 219)',
+ 'road-width': 1,
+ },
{
filter: [
'any',
diff --git a/basemap/layers/highway/highway_line.js
b/basemap/layers/highway/highway_line.js
index 251a3be7..367891a2 100644
--- a/basemap/layers/highway/highway_line.js
+++ b/basemap/layers/highway/highway_line.js
@@ -57,6 +57,11 @@ let directives = [
'line-color': 'rgb(254, 254, 254)',
'road-width': 8,
},
+ {
+ filter: ['==', ['get', 'highway'], 'busway'],
+ 'line-color': 'rgb(254, 254, 254)',
+ 'road-width': 8,
+ },
{
filter: ['==', ['get', 'highway'], 'unclassified'],
'line-color': 'rgb(254, 254, 254)',
diff --git a/basemap/layers/highway/highway_outline.js
b/basemap/layers/highway/highway_outline.js
index 7cf935e5..2b38b0aa 100644
--- a/basemap/layers/highway/highway_outline.js
+++ b/basemap/layers/highway/highway_outline.js
@@ -62,6 +62,12 @@ let directives =[
'road-gap-width': 8,
'road-width': 2,
},
+ {
+ filter: ['==', ['get', 'highway'], 'busway'],
+ 'line-color': 'rgb(190, 189, 188)',
+ 'road-gap-width': 8,
+ 'road-width': 2,
+ },
{
filter: ['==', ['get', 'highway'], 'unclassified'],
'line-color': 'rgb(211, 207, 206)',
diff --git a/basemap/layers/point/icon.js b/basemap/layers/point/icon.js
index d493f452..042804d6 100644
--- a/basemap/layers/point/icon.js
+++ b/basemap/layers/point/icon.js
@@ -167,6 +167,12 @@ let directives = [
'icon-color': 'rgb(0, 146, 219)',
'text-color': 'rgb(0, 146, 219)',
},
+ {
+ filter: ['==', ['get', 'highway'], 'bus_stop'],
+ 'icon-image': 'bus_stop',
+ 'icon-color': 'rgb(0, 146, 219)',
+ 'text-color': 'rgb(0, 146, 219)',
+ },
// Amenity: financial
{
diff --git a/basemap/tests/integration/chateauneuf-bus/metadata.json
b/basemap/tests/integration/chateauneuf-bus/metadata.json
new file mode 100644
index 00000000..04bc28c1
--- /dev/null
+++ b/basemap/tests/integration/chateauneuf-bus/metadata.json
@@ -0,0 +1,7 @@
+{
+ "issue": "https://github.com/apache/incubator-baremaps/issues/678",
+ "width": 512,
+ "height": 512,
+ "center": [7.303902, 46.218922],
+ "zoom": 18
+}