mirror of https://github.com/cloudreve/Cloudreve
feat(media meta): add Mapbox as a map provider option (#2922)
parent
5e5dca40c4
commit
3d41e00384
2
assets
2
assets
|
@ -1 +1 @@
|
||||||
Subproject commit fc7791cde1444e1be0935f1fbc32d956fa6eb756
|
Subproject commit 0bf85fa0abdfa25c4bd20305e2013ac307cfc106
|
File diff suppressed because one or more lines are too long
|
@ -310,6 +310,7 @@ func (s *settingProvider) MapSetting(ctx context.Context) *MapSetting {
|
||||||
return &MapSetting{
|
return &MapSetting{
|
||||||
Provider: MapProvider(s.getString(ctx, "map_provider", "openstreetmap")),
|
Provider: MapProvider(s.getString(ctx, "map_provider", "openstreetmap")),
|
||||||
GoogleTileType: MapGoogleTileType(s.getString(ctx, "map_google_tile_type", "roadmap")),
|
GoogleTileType: MapGoogleTileType(s.getString(ctx, "map_google_tile_type", "roadmap")),
|
||||||
|
MapboxAK: s.getString(ctx, "map_mapbox_ak", ""),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -160,6 +160,7 @@ type MapProvider string
|
||||||
const (
|
const (
|
||||||
MapProviderOpenStreetMap = MapProvider("openstreetmap")
|
MapProviderOpenStreetMap = MapProvider("openstreetmap")
|
||||||
MapProviderGoogle = MapProvider("google")
|
MapProviderGoogle = MapProvider("google")
|
||||||
|
MapProviderMapbox = MapProvider("mapbox")
|
||||||
)
|
)
|
||||||
|
|
||||||
type MapGoogleTileType string
|
type MapGoogleTileType string
|
||||||
|
@ -173,6 +174,7 @@ const (
|
||||||
type MapSetting struct {
|
type MapSetting struct {
|
||||||
Provider MapProvider
|
Provider MapProvider
|
||||||
GoogleTileType MapGoogleTileType
|
GoogleTileType MapGoogleTileType
|
||||||
|
MapboxAK string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Viewer related
|
// Viewer related
|
||||||
|
|
|
@ -47,6 +47,7 @@ type SiteConfig struct {
|
||||||
EmojiPreset string `json:"emoji_preset,omitempty"`
|
EmojiPreset string `json:"emoji_preset,omitempty"`
|
||||||
MapProvider setting.MapProvider `json:"map_provider,omitempty"`
|
MapProvider setting.MapProvider `json:"map_provider,omitempty"`
|
||||||
GoogleMapTileType setting.MapGoogleTileType `json:"google_map_tile_type,omitempty"`
|
GoogleMapTileType setting.MapGoogleTileType `json:"google_map_tile_type,omitempty"`
|
||||||
|
MapboxAK string `json:"mapbox_ak,omitempty"`
|
||||||
FileViewers []types.ViewerGroup `json:"file_viewers,omitempty"`
|
FileViewers []types.ViewerGroup `json:"file_viewers,omitempty"`
|
||||||
MaxBatchSize int `json:"max_batch_size,omitempty"`
|
MaxBatchSize int `json:"max_batch_size,omitempty"`
|
||||||
ThumbnailWidth int `json:"thumbnail_width,omitempty"`
|
ThumbnailWidth int `json:"thumbnail_width,omitempty"`
|
||||||
|
@ -111,6 +112,7 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
|
||||||
Icons: explorerSettings.Icons,
|
Icons: explorerSettings.Icons,
|
||||||
MapProvider: mapSettings.Provider,
|
MapProvider: mapSettings.Provider,
|
||||||
GoogleMapTileType: mapSettings.GoogleTileType,
|
GoogleMapTileType: mapSettings.GoogleTileType,
|
||||||
|
MapboxAK: mapSettings.MapboxAK,
|
||||||
ThumbnailWidth: w,
|
ThumbnailWidth: w,
|
||||||
ThumbnailHeight: h,
|
ThumbnailHeight: h,
|
||||||
CustomProps: customProps,
|
CustomProps: customProps,
|
||||||
|
|
Loading…
Reference in New Issue