ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-01-04 12:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/multiple-renderers'

Browse Source
This commit is contained in:
Lukas Martinelli
2016-12-16 15:01:10 +01:00
parent 20788a0234 0b695dee9a
commit 7c93ad0a24
6 changed files with 199 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app.jsx
View File

@@ -6,7 +6,8 @@ import Container from 'rebass/dist/Container'
import Block from 'rebass/dist/Block'
import Fixed from 'rebass/dist/Fixed'
import { Map } from './map.jsx'
import { MapboxGlMap } from './gl.jsx'
import { OpenLayers3Map } from './ol3.jsx'
import {Toolbar} from './toolbar.jsx'
import style from './style.js'
import { loadDefaultStyle, SettingsStore, StyleStore } from './stylestore.js'
@@ -116,7 +117,7 @@ export default class App extends React.Component {
accessToken={this.state.accessToken}
onAccessTokenChanged={this.onAccessTokenChanged.bind(this)}
/>
<Map
<OpenLayers3Map
mapStyle={this.state.currentStyle}
accessToken={this.state.accessToken}
/>