schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-12-27 08:35:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #606 from orangemug/fix/issue-591

Browse source 
Added style formatting into the api store
This commit is contained in:
Orange Mug 2020-04-19 08:38:37 +01:00 committed by GitHub
commit c3670701e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/modals/ExportModal.jsx
View file

@ -15,16 +15,6 @@ import fieldSpecAdditional from '../../libs/field-spec-additional'
function stripAccessTokens(mapStyle) {
const changedMetadata = { ...mapStyle.metadata }
delete changedMetadata['maputnik:mapbox_access_token']
delete changedMetadata['maputnik:openmaptiles_access_token']
return {
...mapStyle,
metadata: changedMetadata
}
}
class ExportModal extends React.Component {
static propTypes = {
mapStyle: PropTypes.object.isRequired,
@ -38,7 +28,11 @@ class ExportModal extends React.Component {
}
downloadStyle() {
const tokenStyle = format(stripAccessTokens(style.replaceAccessTokens(this.props.mapStyle)));
const tokenStyle = format(
style.stripAccessTokens(
style.replaceAccessTokens(this.props.mapStyle)
)
);
const blob = new Blob([tokenStyle], {type: "application/json;charset=utf-8"});
let exportName;

9
src/libs/apistore.js
View file

@ -1,4 +1,5 @@
import style from './style.js'
import {format} from '@mapbox/mapbox-gl-style-spec'
import ReconnectingWebSocket from 'reconnecting-websocket'
export class ApiStyleStore {
@ -64,6 +65,12 @@ export class ApiStyleStore {
// Save current style replacing previous version
save(mapStyle) {
const styleJSON = format(
style.stripAccessTokens(
style.replaceAccessTokens(newStyle)
)
);
const id = mapStyle.id
fetch(this.localUrl + '/styles/' + id, {
method: "PUT",
@ -71,7 +78,7 @@ export class ApiStyleStore {
headers: {
"Content-Type": "application/json; charset=utf-8",
},
body: JSON.stringify(mapStyle)
body: styleJSON
})
.catch(function(error) {
if(error) console.error(error)

13
src/libs/style.js
View file

@ -114,6 +114,18 @@ function replaceAccessTokens(mapStyle, opts={}) {
return changedStyle
}
function stripAccessTokens(mapStyle) {
const changedMetadata = {
...mapStyle.metadata
};
delete changedMetadata['maputnik:mapbox_access_token'];
delete changedMetadata['maputnik:openmaptiles_access_token'];
return {
...mapStyle,
metadata: changedMetadata
};
}
export default {
ensureStyleValidity,
emptyStyle,
@ -121,4 +133,5 @@ export default {
generateId,
getAccessToken,
replaceAccessTokens,
stripAccessTokens,
}