This repository was archived by the owner on Apr 8, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev-map' into development
- Loading branch information
Showing
58 changed files
with
2,587 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| <template> | ||
| <mapbox | ||
| :access-token="''" | ||
| :map-options="actualMapOptions" | ||
| @map-load="loaded" | ||
| @map-init="mapInitialized" | ||
| /> | ||
| </template> | ||
|
|
||
| <script> | ||
| import Mapbox from 'mapbox-gl-vue' | ||
| export default { | ||
| components: { Mapbox }, | ||
| props: { | ||
| mapId: { | ||
| type: String, | ||
| default: '' | ||
| }, | ||
| initialBounds: { | ||
| type: Array, | ||
| default: () => { | ||
| return [] | ||
| } | ||
| }, | ||
| mapOptions: { | ||
| type: Object, | ||
| required: false, | ||
| default: () => { | ||
| return {} | ||
| } | ||
| } | ||
| }, | ||
| data() { | ||
| return { | ||
| dateSequence: [], | ||
| mapObject: null, | ||
| legend: null | ||
| } | ||
| }, | ||
| computed: { | ||
| actualMapOptions() { | ||
| return { | ||
| style: | ||
| 'https://tokyo-metropolitan-gov.github.io/tokyo-vector-tile/style.json', | ||
| zoom: 14, | ||
| center: [139.69167, 35.689444], | ||
| antialias: false, | ||
| interactive: false, | ||
| ...this.mapOptions, | ||
| container: this.mapId | ||
| } | ||
| } | ||
| }, | ||
| methods: { | ||
| dataDrivenInitialization(map) { | ||
| if (this.dateSequence.length !== 0) { | ||
| return | ||
| } | ||
| const self = this | ||
| const features = map.queryRenderedFeatures({ layers: ['heatmap'] }) | ||
| if (features.length === 0) { | ||
| setTimeout(self.dataDrivenInitialization, 1000, map) | ||
| return | ||
| } | ||
| this.dateSequence = Object.keys(features[0].properties).sort() | ||
| const lastDate = this.dateSequence[this.dateSequence.length - 1] | ||
| let m = 0 | ||
| features.forEach(feature => { | ||
| if (m < feature.properties[lastDate]) { | ||
| m = feature.properties[lastDate] | ||
| } | ||
| }) | ||
| const ceil = 10000 + Math.floor(m * 0.0001) * 10000 | ||
| const unit = 0.25 * ceil | ||
| this.legend = [unit, 2 * unit, 3 * unit] | ||
| map.setPaintProperty('heatmap', 'fill-color', [ | ||
| 'step', | ||
| ['get', lastDate], | ||
| '#1B75BC', | ||
| this.legend[0], | ||
| '#238B45', | ||
| this.legend[1], | ||
| '#006D2C', | ||
| this.legend[2], | ||
| '#00441B' | ||
| ]) | ||
| self.$emit('legendUpdated', [ | ||
| { color: '#1B75BC', valueFrom: 0, valueTo: this.legend[0] }, | ||
| { | ||
| color: '#238B45', | ||
| valueFrom: this.legend[0], | ||
| valueTo: this.legend[1] | ||
| }, | ||
| { | ||
| color: '#006D2C', | ||
| valueFrom: this.legend[1], | ||
| valueTo: this.legend[2] | ||
| }, | ||
| { color: '#00441B', valueFrom: this.legend[2], valueTo: null } | ||
| ]) | ||
| self.$emit('input', self.getChartData(map)) | ||
| map.on('moveend', _e => { | ||
| self.$emit('input', self.getChartData(map)) | ||
| }) | ||
| self.$emit('loadCompleted') | ||
| }, | ||
| getChartData(map) { | ||
| const features = map.queryRenderedFeatures({ layers: ['heatmap'] }) | ||
| if (this.dateSequence.length === 0) { | ||
| if (features.length === 0) { | ||
| return [ | ||
| { date: '20200201', value: 0 }, | ||
| { date: '20200202', value: 0 } | ||
| ] | ||
| } | ||
| this.dateSequence = Object.keys(features[0]).sort() | ||
| } | ||
| const dateValueMap = {} | ||
| this.dateSequence.forEach(d => { | ||
| dateValueMap[d] = 0 | ||
| }) | ||
| features.forEach(feature => { | ||
| Object.keys(feature.properties).forEach(k => { | ||
| dateValueMap[k] += feature.properties[k] | ||
| }) | ||
| }) | ||
| return Object.keys(dateValueMap).map(d => { | ||
| return { | ||
| date: d, | ||
| value: dateValueMap[d] | ||
| } | ||
| }) | ||
| }, | ||
| loaded(map) { | ||
| // const tileUrl = `https://map-covid19-tokyo.netlify.com/mashed_tiles/{z}/{x}/{y}.pbf` | ||
| // const tileUrl = `http://localhost:3000/mashed_tiles/{z}/{x}/{y}.pbf` | ||
| const tileUrl = | ||
| 'https://deploy-preview-2--map-covid19-tokyo.netlify.com/mashed_tiles/{z}/{x}/{y}.pbf' | ||
| if ( | ||
| this.initialBounds.length > 1 && | ||
| this.initialBounds[0].length > 1 && | ||
| this.initialBounds[1].length > 1 | ||
| ) { | ||
| map.fitBounds(this.initialBounds, { linear: true }) | ||
| } | ||
| map.addLayer({ | ||
| id: 'heatmap', | ||
| type: 'fill', | ||
| source: { | ||
| type: 'vector', | ||
| tiles: [tileUrl], | ||
| minzoom: 11, | ||
| maxzoom: 11 | ||
| }, | ||
| 'source-layer': 'dfi-place-heatmap-population', | ||
| paint: { | ||
| 'fill-color': '#fff', | ||
| 'fill-opacity': 0.5, | ||
| 'fill-outline-color': '#ffffff' | ||
| } | ||
| }) | ||
| this.dataDrivenInitialization(map) | ||
| }, | ||
| mapInitialized(map) { | ||
| this.mapObject = map | ||
| }, | ||
| updatePaintProperty(targetDate) { | ||
| if (this.mapObject !== null && this.legend !== null) { | ||
| const p = [ | ||
| 'step', | ||
| ['get', targetDate], | ||
| '#1B75BC', | ||
| this.legend[0], | ||
| '#238B45', | ||
| this.legend[1], | ||
| '#006D2C', | ||
| this.legend[2], | ||
| '#00441B' | ||
| ] | ||
| this.mapObject.setPaintProperty('heatmap', 'fill-color', p) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <template> | ||
| <div> | ||
| <ul class="clearfix"> | ||
| <li v-for="item in legendData" :key="item.valueFrom"> | ||
| <span class="LegendBlock" :style="`background-color: ${item.color}`" /> | ||
| {{ `${item.valueFrom}〜${item.valueTo !== null ? item.valueTo : ''}` }} | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
| .LegendBlock { | ||
| width: 16px; | ||
| height: 16px; | ||
| display: inline-block; | ||
| } | ||
| li { | ||
| list-style: none; | ||
| float: left; | ||
| font-size: 14px; | ||
| padding-right: 4px; | ||
| } | ||
| li:last-child { | ||
| padding-right: 0; | ||
| } | ||
| ul { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| .clearfix:after { | ||
| content: ''; | ||
| display: block; | ||
| clear: both; | ||
| } | ||
| </style> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| legendData: { | ||
| type: Array, | ||
| default: () => { | ||
| return [] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </script> |
Oops, something went wrong.