Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Replace bundled styles with mapbox: style URLs #2746

Merged
merged 3 commits into from
Oct 30, 2015
Merged

Replace bundled styles with mapbox: style URLs #2746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abf93c0
[core] Remove bundled styles.
Oct 23, 2015
3b6dc37
Fixed build issues and typos
1ec5 Oct 28, 2015
557b8af
[core][iOS] Source iOS styles from default_styles
1ec5 Oct 29, 2015
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
Prev Previous commit
Next Next commit
Fixed build issues and typos 
Also renamed styles to more common names.
  • Loading branch information
@1ec5
1ec5 committed Oct 30, 2015
commit 3b6dc37e396931c883fe6ab602802dbb00defed9
1 change: 0 additions & 1 deletion mbgl.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
'./gyp/common.gypi',
'./gyp/shaders.gypi',
'./gyp/version.gypi',
'./gyp/styles.gypi',
'./gyp/certificates.gypi',
'./gyp/standalone.gypi',
'./gyp/core.gypi',
Expand Down
4 changes: 2 additions & 2 deletions platform/default/default_styles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace mbgl {
namespace util {

const std::vector<std::pair<std::string, std::string>> defaultStyles = {
{ "mapbox://styles/mapbox/streets-v8", "Mapbox Streets" },
{ "mapbox://styles/mapbox/streets-v8", "Streets" },
{ "mapbox://styles/mapbox/emerald-v8", "Emerald" },
{ "mapbox://styles/mapbox/light-v8", "Light" },
{ "mapbox://styles/mapbox/dark-v8", "Dark" },
{ "mapbox://styles/mapbox/satellite-v8", "Satellite" },
{ "mapbox://styles/mapbox/satellite-hyrid-v8", "Satellite Streets" },
{ "mapbox://styles/mapbox/satellite-hybrid-v8", "Hybrid" },
};

} // end namespace util
Expand Down