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/16 08:35:03 UTC
[incubator-baremaps] branch 695-display-natural=wood-layer-on-top-of-leisure=park-layer updated (fe100274 -> c57bf7f9)
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
omit fe100274 Fix regression aeroway
omit 5457824c Rename theme variables
new 991f2958 Rename theme variables
new c57bf7f9 Fix regression aeroway
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fe100274)
\
N -- N -- N refs/heads/695-display-natural=wood-layer-on-top-of-leisure=park-layer (c57bf7f9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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/themes/default.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[incubator-baremaps] 01/02: Rename theme variables
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 991f2958c790e8da5fbc70e6a703ffa49d27aa46
Author: Leonard <le...@gmail.com>
AuthorDate: Fri Jun 16 10:23:57 2023 +0200
Rename theme variables
---
basemap/layers/landuse/overlay.js | 2 +-
basemap/layers/leisure/overlay.js | 24 ++++++++++++------------
basemap/themes/default.js | 26 +++++++++++++-------------
basemap/themes/light.js | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/basemap/layers/landuse/overlay.js b/basemap/layers/landuse/overlay.js
index 3f97aa80..cca18144 100644
--- a/basemap/layers/landuse/overlay.js
+++ b/basemap/layers/landuse/overlay.js
@@ -31,7 +31,7 @@ let directives = [
},
{
filter: ['==', ['get', 'landuse'], 'meadow'],
- 'fill-color': theme.landuseBackgroundMeadowFillColor,
+ 'fill-color': theme.landuseOverlayMeadowFillColor,
},
];
diff --git a/basemap/layers/leisure/overlay.js b/basemap/layers/leisure/overlay.js
index dd326e83..f8ee7327 100644
--- a/basemap/layers/leisure/overlay.js
+++ b/basemap/layers/leisure/overlay.js
@@ -21,39 +21,39 @@ let directives = [
{
filter: ['==', ['get', 'leisure'], 'swimming_pool'],
'fill-color': theme.leisureBackgroundSwimmingPoolFillColor,
- 'fill-outline-color': theme.leisureBackgroundSwimmingPoolFillOutlineColor,
+ 'fill-outline-color': theme.leisureOverlaySwimmingPoolFillOutlineColor,
},
{
filter: ['==', ['get', 'leisure'], 'fitness_station'],
- 'fill-color': theme.leisureBackgroundFitnessStationFillColor,
- 'fill-outline-color': theme.leisureBackgroundFitnessStationFillOutlineColor,
+ 'fill-color': theme.leisureOverlayFitnessStationFillColor,
+ 'fill-outline-color': theme.leisureOverlayFitnessStationFillOutlineColor,
},
{
filter: ['==', ['get', 'leisure'], 'miniature_golf'],
- 'fill-color': theme.leisureBackgroundMiniatureGolfFillColor,
+ 'fill-color': theme.leisureOverlayMiniatureGolfFillColor,
},
{
filter: ['==', ['get', 'leisure'], 'ice_rink'],
- 'fill-color': theme.leisureBackgroundIceRinkFillColor,
- 'fill-outline-color': theme.leisureBackgroundIceRinkFillOutlineColor,
+ 'fill-color': theme.leisureOverlayIceRinkFillColor,
+ 'fill-outline-color': theme.leisureOverlayIceRinkFillOutlineColor,
},
{
filter: ['==', ['get', 'leisure'], 'dog_park'],
- 'fill-color': theme.leisureBackgroundDogParkFillColor,
+ 'fill-color': theme.leisureOverlayDogParkFillColor,
},
{
filter: ['==', ['get', 'leisure'], 'playground'],
- 'fill-color': theme.leisureBackgroundPlayGroundFillColor,
- 'fill-outline-color': theme.leisureBackgroundPlayGroundFillOutlineColor,
+ 'fill-color': theme.leisureOverlayPlayGroundFillColor,
+ 'fill-outline-color': theme.leisureOverlayPlayGroundFillOutlineColor,
},
{
filter: ['==', ['get', 'leisure'], 'pitch'],
- 'fill-color': theme.leisureBackgroundPitchFillColor,
- 'fill-outline-color': theme.leisureBackgroundPitchFillOutlineColor,
+ 'fill-color': theme.leisureOverlayPitchFillColor,
+ 'fill-outline-color': theme.leisureOverlayPitchFillOutlineColor,
},
{
filter: ['==', ['get', 'leisure'], 'stadium'],
- 'fill-color': theme.leisureBackgroundStadiumFillColor,
+ 'fill-color': theme.leisureOverlayStadiumFillColor,
},
];
diff --git a/basemap/themes/default.js b/basemap/themes/default.js
index 6248871a..c9ddc98d 100644
--- a/basemap/themes/default.js
+++ b/basemap/themes/default.js
@@ -212,7 +212,7 @@ export default {
landuseBackgroundGreenfieldFillColor: 'rgb(242, 238, 232)',
landuseBackgroundIndustrialFillColor: 'rgb(235, 219, 232)',
landuseBackgroundLandfillFillColor: 'rgb(182, 182, 144)',
- landuseBackgroundMeadowFillColor: 'rgb(205, 235, 176)',
+ landuseOverlayMeadowFillColor: 'rgb(205, 235, 176)',
landuseBackgroundMilitaryFillColor: 'rgb(242, 228, 221)',
landuseBackgroundPedestrianFillColor: 'rgb(221, 221, 233)',
landuseBackgroundPlantNurseryFillColor: 'rgb(174, 223, 162)',
@@ -229,23 +229,23 @@ export default {
landuseOverlayGrassFillColor: 'rgb(205, 235, 176)',
landuseOverlayGreenhouseHorticultureFillColor: 'rgb(237, 240, 214)',
landuseOverlayOrchardFillColor: 'rgb(172, 225, 161)',
- leisureBackgroundDogParkFillColor: 'rgb(224, 252, 227)',
+ leisureOverlayDogParkFillColor: 'rgb(224, 252, 227)',
leisureBackgroundGardenFillColor: 'rgb(205, 235, 176)',
leisureBackgroundGolfCourseFillColor: 'rgb(221, 246, 192)',
- leisureBackgroundIceRinkFillColor: 'rgb(221, 236, 236)',
- leisureBackgroundIceRinkFillOutlineColor: 'rgb(140, 220, 189)',
- leisureBackgroundMiniatureGolfFillColor: 'rgb(181, 226, 181)',
+ leisureOverlayIceRinkFillColor: 'rgb(221, 236, 236)',
+ leisureOverlayIceRinkFillOutlineColor: 'rgb(140, 220, 189)',
+ leisureOverlayMiniatureGolfFillColor: 'rgb(181, 226, 181)',
leisureBackgroundParkFillColor: 'rgb(200, 250, 204)',
- leisureBackgroundPitchFillColor: 'rgb(170, 224, 203)',
- leisureBackgroundPitchFillOutlineColor: 'rgb(151, 212, 186)',
- leisureBackgroundPlayGroundFillColor: 'rgb(223, 252, 226)',
- leisureBackgroundPlayGroundFillOutlineColor: 'rgb(164, 221, 169)',
+ leisureOverlayPitchFillColor: 'rgb(170, 224, 203)',
+ leisureOverlayPitchFillOutlineColor: 'rgb(151, 212, 186)',
+ leisureOverlayPlayGroundFillColor: 'rgb(223, 252, 226)',
+ leisureOverlayPlayGroundFillOutlineColor: 'rgb(164, 221, 169)',
leisureBackgroundSportsCentreFillColor: 'rgb(223, 252, 226)',
- leisureBackgroundStadiumFillColor: 'rgb(223, 252, 226)',
+ leisureOverlayStadiumFillColor: 'rgb(223, 252, 226)',
leisureBackgroundSwimmingPoolFillColor: 'rgb(170, 211, 223)',
- leisureBackgroundSwimmingPoolFillOutlineColor: 'rgb(120, 183, 202)',
- leisureBackgroundFitnessStationFillColor: 'rgb(223, 252, 226)',
- leisureBackgroundFitnessStationFillOutlineColor: 'rgb(164, 221, 169)',
+ leisureOverlaySwimmingPoolFillOutlineColor: 'rgb(120, 183, 202)',
+ leisureOverlayFitnessStationFillColor: 'rgb(223, 252, 226)',
+ leisureOverlayFitnessStationFillOutlineColor: 'rgb(164, 221, 169)',
leisureBackgroundTrackFillColor: 'rgb(196, 224, 203)',
leisureBackgroundTrackFillOutlineColor: 'rgba(101, 206, 166, 1.0)',
leisureNatureReserveLineColor: 'rgba(230, 233, 222, 0.5)',
diff --git a/basemap/themes/light.js b/basemap/themes/light.js
index eb59de8c..2027d9e0 100644
--- a/basemap/themes/light.js
+++ b/basemap/themes/light.js
@@ -20,7 +20,7 @@ export default Object.entries(positronScheme).reduce((acc, [key, value]) => {
attractionStyleWaterSlideLineColor: 'rgb(175,175,175)',
landuseBackgroundBasinFillColor: 'rgb(175,175,175)',
leisureBackgroundSwimmingPoolFillColor: 'rgb(175,175,175)',
- leisureBackgroundSwimmingPoolFillOutlineColor: 'rgb(175,175,175)',
+ leisureOverlaySwimmingPoolFillOutlineColor: 'rgb(175,175,175)',
naturalBackgroundWaterFillColor: 'rgb(175,175,175)',
naturalOverlayLakeFillColor: 'rgb(175,175,175)',
naturalWaterFillColor: 'rgb(175,175,175)',
[incubator-baremaps] 02/02: Fix regression aeroway
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 c57bf7f964734ffdc2de4547511594bfebedd404
Author: Leonard <le...@gmail.com>
AuthorDate: Fri Jun 16 10:26:06 2023 +0200
Fix regression aeroway
---
basemap/themes/default.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basemap/themes/default.js b/basemap/themes/default.js
index c9ddc98d..a6173d41 100644
--- a/basemap/themes/default.js
+++ b/basemap/themes/default.js
@@ -3,7 +3,7 @@ export default {
aerialwayStyleLinePaintLineColor: 'rgb(177, 177, 175)',
aerowayLineRunwayLineColor: 'rgba(187, 187, 204, 1.0)',
aerowayLineTaxiwayLineColor: 'rgba(187, 187, 204, 1.0)',
- aerowayPolygonLineColor: 'rgba(187, 187, 204, 1.0)',
+ aerowayPolygonLineColor: 'rgba(213, 213, 220, 1.0)',
amenityBackgroundCollegeFillColor: 'rgb(255, 255, 228)',
amenityBackgroundGraveYardFillColor: 'rgb(170, 203, 175)',
amenityBackgroundHospitalFillColor: 'rgb(255, 255, 228)',