mirror of
https://github.com/maputnik/editor.git
synced 2026-08-24 05:57:25 +00:00
Merge pull request #240 from orangemug/fix/do-not-expose-fallback-tokens
Do not expose fallback tokens during export
This commit is contained in:
@@ -251,7 +251,7 @@ export default class App extends React.Component {
|
|||||||
|
|
||||||
mapRenderer() {
|
mapRenderer() {
|
||||||
const mapProps = {
|
const mapProps = {
|
||||||
mapStyle: style.replaceAccessToken(this.state.mapStyle),
|
mapStyle: style.replaceAccessToken(this.state.mapStyle, {allowFallback: true}),
|
||||||
onDataChange: (e) => {
|
onDataChange: (e) => {
|
||||||
this.layerWatcher.analyzeMap(e.map)
|
this.layerWatcher.analyzeMap(e.map)
|
||||||
this.fetchSources();
|
this.fetchSources();
|
||||||
|
|||||||
+12
-2
@@ -54,13 +54,23 @@ function indexOfLayer(layers, layerId) {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
function replaceAccessToken(mapStyle) {
|
function replaceAccessToken(mapStyle, opts={}) {
|
||||||
const omtSource = mapStyle.sources.openmaptiles
|
const omtSource = mapStyle.sources.openmaptiles
|
||||||
if(!omtSource) return mapStyle
|
if(!omtSource) return mapStyle
|
||||||
if(!omtSource.hasOwnProperty("url")) return mapStyle
|
if(!omtSource.hasOwnProperty("url")) return mapStyle
|
||||||
|
|
||||||
const metadata = mapStyle.metadata || {}
|
const metadata = mapStyle.metadata || {}
|
||||||
const accessToken = metadata['maputnik:openmaptiles_access_token'] || tokens.openmaptiles
|
let accessToken = metadata['maputnik:openmaptiles_access_token'];
|
||||||
|
|
||||||
|
if(opts.allowFallback && !accessToken) {
|
||||||
|
accessToken = tokens.openmaptiles;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!accessToken) {
|
||||||
|
// Early exit.
|
||||||
|
return mapStyle;
|
||||||
|
}
|
||||||
|
|
||||||
const changedSources = {
|
const changedSources = {
|
||||||
...mapStyle.sources,
|
...mapStyle.sources,
|
||||||
openmaptiles: {
|
openmaptiles: {
|
||||||
|
|||||||
Reference in New Issue
Block a user