Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme variables and Positron Scheme #691

Merged
merged 22 commits into from
Jun 15, 2023
Merged

Conversation

MaximeLesti
Copy link
Contributor

List color variables and add a positron scheme

@MaximeLesti MaximeLesti marked this pull request as ready for review June 7, 2023 13:43
basemap/themes/light.js Fixed Show fixed Hide fixed
basemap/themes/light.js Fixed Show fixed Hide fixed
Copy link
Member

@bchapuis bchapuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall this looks very good. We will merge it after the next round of changes.

@@ -9,6 +9,8 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
**/
import colorScheme from "../../theme.js";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you rename colorScheme into theme. We will eventually have more than a color scheme in the theme.

@@ -12,7 +12,7 @@
export default {
"host": "http://localhost:9000",
"database": "jdbc:postgresql://localhost:5432/baremaps?&user=baremaps&password=baremaps",
"osmPbfUrl": "https://download.geofabrik.de/europe/switzerland-latest.osm.pbf",
"center": [6.6323, 46.5197],
"osmPbfUrl": "https://download.geofabrik.de/europe/liechtenstein-latest.osm.pbf",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you keep the original file here (switzerland-latest.osm.pbf).

@@ -10,16 +10,18 @@
the License.
**/
import {asLayerObject, withSortKeys} from "../../utils/utils.js";
import colorScheme from "../../theme.js";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename colorScheme

@@ -10,11 +10,12 @@
the License.
**/
import {asLayerObject, withSortKeys} from "../../utils/utils.js";
import colorScheme from "../../theme.js";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename colorScheme

@@ -10,31 +10,32 @@
the License.
**/
import {asLayerObject, withSortKeys} from "../../utils/utils.js";
import colorScheme from "../../theme.js";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename colorScheme

@@ -9,6 +9,8 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
**/
import colorScheme from "../../theme.js";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename colorScheme

@@ -0,0 +1,608 @@
export default {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort lines alphabetically

landuseOverlayOrchardFillColor: 'rgb(172, 225, 161)',
pointCountryLabelCountryTextColor: 'rgb(90, 56, 90)',
pointCountryLabelPaintTextHaloColor: 'rgba(255, 255, 255, 0.8)',
LeisureBackgroundSwimmingPoolFillColor: 'rgb(170, 211, 223)',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change the case

import * as importedTools from "./tools.js";
import positronScheme from "./positron.js";

const CLARITYFACTOR=4.7;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format code with intellij

basemap/tileset.js Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Jun 15, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@bchapuis bchapuis merged commit c5ee7a2 into apache:main Jun 15, 2023
@bchapuis
Copy link
Member

Thanks a lot for the changes, this is a great addition to the project!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants