Merge pull request #603 from orangemug/feature/add-image-and-video-sources

Added ability to add image/video sources
This commit is contained in:
Orange Mug 2020-01-23 08:49:37 +00:00 committed by GitHub
commit 7aa0298f7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 129 additions and 0 deletions

View file

@ -60,6 +60,12 @@ function editorMode(source) {
return 'geojson_json'; return 'geojson_json';
} }
} }
if(source.type === 'image') {
return 'image';
}
if(source.type === 'video') {
return 'video';
}
return null return null
} }
@ -153,6 +159,28 @@ class AddSource extends React.Component {
minzoom: source.minzoom || 0, minzoom: source.minzoom || 0,
maxzoom: source.maxzoom || 14 maxzoom: source.maxzoom || 14
} }
case 'image': return {
type: 'image',
url: `${protocol}//localhost:3000/image.png`,
coordinates: [
[0,0],
[0,0],
[0,0],
[0,0],
],
}
case 'video': return {
type: 'video',
urls: [
`${protocol}//localhost:3000/movie.mp4`
],
coordinates: [
[0,0],
[0,0],
[0,0],
[0,0],
],
}
default: return {} default: return {}
} }
} }
@ -185,6 +213,8 @@ class AddSource extends React.Component {
['tilexyz_raster', 'Raster (XYZ URL)'], ['tilexyz_raster', 'Raster (XYZ URL)'],
['tilejson_raster-dem', 'Raster DEM (TileJSON URL)'], ['tilejson_raster-dem', 'Raster DEM (TileJSON URL)'],
['tilexyz_raster-dem', 'Raster DEM (XYZ URLs)'], ['tilexyz_raster-dem', 'Raster DEM (XYZ URLs)'],
['image', 'Image'],
['video', 'Video'],
]} ]}
onChange={mode => this.setState({mode: mode, source: this.defaultSource(mode)})} onChange={mode => this.setState({mode: mode, source: this.defaultSource(mode)})}
value={this.state.mode} value={this.state.mode}

View file

@ -6,6 +6,8 @@ import StringInput from '../inputs/StringInput'
import UrlInput from '../inputs/UrlInput' import UrlInput from '../inputs/UrlInput'
import NumberInput from '../inputs/NumberInput' import NumberInput from '../inputs/NumberInput'
import SelectInput from '../inputs/SelectInput' import SelectInput from '../inputs/SelectInput'
import DynamicArrayInput from '../inputs/DynamicArrayInput'
import ArrayInput from '../inputs/ArrayInput'
import JSONEditor from '../layers/JSONEditor' import JSONEditor from '../layers/JSONEditor'
@ -88,6 +90,100 @@ class TileURLSourceEditor extends React.Component {
} }
} }
class ImageSourceEditor extends React.Component {
static propTypes = {
source: PropTypes.object.isRequired,
onChange: PropTypes.func.isRequired,
}
render() {
const changeCoord = (idx, val) => {
const coordinates = this.props.source.coordinates.slice(0);
coordinates[idx] = val;
this.props.onChange({
...this.props.source,
coordinates,
});
}
return <div>
<InputBlock label={"Image URL"} doc={latest.source_image.url.doc}>
<UrlInput
value={this.props.source.url}
onChange={url => this.props.onChange({
...this.props.source,
url,
})}
/>
</InputBlock>
{["top left", "top right", "bottom right", "bottom left"].map((label, idx) => {
return (
<InputBlock label={`Coord ${label}`} key={label}>
<ArrayInput
length={2}
type="number"
value={this.props.source.coordinates[idx]}
default={[0, 0]}
onChange={(val) => changeCoord(idx, val)}
/>
</InputBlock>
);
})}
</div>
}
}
class VideoSourceEditor extends React.Component {
static propTypes = {
source: PropTypes.object.isRequired,
onChange: PropTypes.func.isRequired,
}
render() {
const changeCoord = (idx, val) => {
const coordinates = this.props.source.coordinates.slice(0);
coordinates[idx] = val;
this.props.onChange({
...this.props.source,
coordinates,
});
}
const changeUrls = (urls) => {
this.props.onChange({
...this.props.source,
urls,
});
}
return <div>
<InputBlock label={"Video URL"} doc={latest.source_video.urls.doc}>
<DynamicArrayInput
type="string"
value={this.props.source.urls}
default={""}
onChange={changeUrls}
/>
</InputBlock>
{["top left", "top right", "bottom right", "bottom left"].map((label, idx) => {
return (
<InputBlock label={`Coord ${label}`} key={label}>
<ArrayInput
length={2}
type="number"
value={this.props.source.coordinates[idx]}
default={[0, 0]}
onChange={val => changeCoord(idx, val)}
/>
</InputBlock>
);
})}
</div>
}
}
class GeoJSONSourceUrlEditor extends React.Component { class GeoJSONSourceUrlEditor extends React.Component {
static propTypes = { static propTypes = {
source: PropTypes.object.isRequired, source: PropTypes.object.isRequired,
@ -161,6 +257,8 @@ class SourceTypeEditor extends React.Component {
/> />
</InputBlock> </InputBlock>
</TileURLSourceEditor> </TileURLSourceEditor>
case 'image': return <ImageSourceEditor {...commonProps} />
case 'video': return <VideoSourceEditor {...commonProps} />
default: return null default: return null
} }
} }

View file

@ -138,6 +138,7 @@
user-select: none; user-select: none;
width: 50%; width: 50%;
vertical-align: top; vertical-align: top;
font-size: 12px;
} }
&-content { &-content {