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.

Sign up for GitHub

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

bump mapbox gl js to v3, replace Streets with Standard #875

Merged
merged 1 commit into from
Jan 31, 2024
Merged

bump mapbox gl js to v3, replace Streets with Standard #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
* Uses mapbox-gj.js for map rendering, including the new globe projection.
* Adds mapbox-gl-draw with a rectangle mode and a custom edit UI/UX to be similar to the edit button in leaflet-draw
* Adds a projection toggle UI (visible at zoom 6 and below) for switching between globe (default) and mercator
* Replaces the existing layer switch with more mapbox core style options (Streets, Satellite Streets, Outdoors, Light, Dark)
* Replaces the existing layer switch with more mapbox core style options (Standard, Satellite Streets, Outdoors, Light, Dark)
* Formats geojson on paste (useful when pasting single-line geojson from a scripted output somewhere, if the pasted string is valid JSON it will be automatically pretty-printed in the editor)

## 2022-10-05
Expand Down
60 changes: 37 additions & 23 deletions package-lock.json
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

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

Is it expected that npm ci command fails without --force flag?

Copy link

Choose a reason for hiding this comment

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

CleanShot 2024-01-31 at 09 48 50@2x

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I remember the same gl-geocoder dependency issue popping up when v3 came out. Yes, this is expected until we bump the version on mapbox-gl-geocoder. I'll get to it soon along with some other dependencies.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"geojson-random": "0.1.0",
"geojson2dsv": "0.1.0",
"lodash": "^4.17.21",
"mapbox-gl": "2.13.0",
"mapbox-gl": "3.1.2",
"numeral": "^2.0.6",
"osmtogeojson": "3.0.0-beta.5",
"polytogeojson": "0.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
DEFAULT_PROJECTION: 'globe',
DEFAULT_STYLE: 'Streets',
DEFAULT_STYLE: 'Standard',
DEFAULT_DARK_FEATURE_COLOR: '#555',
DEFAULT_LIGHT_FEATURE_COLOR: '#e8e8e8',
DEFAULT_SATELLITE_FEATURE_COLOR: '#00f900'
Expand Down
4 changes: 2 additions & 2 deletions src/ui/map/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = [
{
title: 'Streets',
style: 'mapbox://styles/mapbox/streets-v12'
title: 'Standard',
style: 'mapbox://styles/mapbox/standard'
},
{
title: 'Satellite Streets',
Expand Down
Loading