Skip to content

Commit

Permalink
merge data files
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiaoji Chen committed Oct 2, 2017
1 parent 5e5a587 commit 9fa78c8
Show file tree
Hide file tree
Showing 14 changed files with 10,040 additions and 20,049 deletions.
2 changes: 1 addition & 1 deletion src/demos/building-a-geospatial-app/2-scatterplot-overlay/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import DeckGLOverlay from './deckgl-overlay';
import {LayerControls, SCATTERPLOT_CONTROLS} from './layer-controls';
import Spinner from './spinner';
import {tooltipStyle} from './style';
import taxiData from '../data/taxi';
import taxiData from '../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
2 changes: 1 addition & 1 deletion src/demos/building-a-geospatial-app/3-hexagon-overlay/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from './layer-controls';
import Spinner from './spinner';
import {tooltipStyle} from './style';
import taxiData from '../data/taxi';
import taxiData from '../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
6 changes: 3 additions & 3 deletions src/demos/building-a-geospatial-app/4-basic-charts/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Charts from './charts';
import Spinner from './spinner';
import {tooltipStyle} from './style';

import taxiData from '../data/taxi';
import taxiData from '../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down Expand Up @@ -53,8 +53,8 @@ export default class App extends Component {
if (taxiData) {
this.setState({status: 'LOADED'});
const data = taxiData.reduce((accu, curr) => {
const pickupHour = new Date(curr.tpep_pickup_datetime).getUTCHours();
const dropoffHour = new Date(curr.tpep_dropoff_datetime).getUTCHours();
const pickupHour = new Date(curr.pickup_datetime).getUTCHours();
const dropoffHour = new Date(curr.dropoff_datetime).getUTCHours();

const pickupLongitude = Number(curr.pickup_longitude);
const pickupLatitude = Number(curr.pickup_latitude);
Expand Down
6 changes: 3 additions & 3 deletions src/demos/building-a-geospatial-app/5-interaction/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Charts from './charts';
import Spinner from './spinner';
import {tooltipStyle} from './style';

import taxiData from '../data/taxi';
import taxiData from '../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down Expand Up @@ -53,8 +53,8 @@ export default class App extends Component {
if (taxiData) {
this.setState({status: 'LOADED'});
const data = taxiData.reduce((accu, curr) => {
const pickupTime = curr.tpep_pickup_datetime || '';
const dropoffTime = curr.tpep_dropoff_datetime || '';
const pickupTime = curr.pickup_datetime || '';
const dropoffTime = curr.dropoff_datetime || '';

const distance = curr.trip_distance;
const amount = curr.total_amount;
Expand Down
6 changes: 3 additions & 3 deletions src/demos/building-a-geospatial-app/6-linking-it-all/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import Charts from './charts';
import Spinner from './spinner';
import {tooltipStyle} from './style';
import taxiData from '../data/taxi';
import taxiData from '../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down Expand Up @@ -54,8 +54,8 @@ export default class App extends Component {
this.setState({status: 'LOADED'});
const data = taxiData.reduce((accu, curr) => {

const pickupHour = new Date(curr.tpep_pickup_datetime).getUTCHours();
const dropoffHour = new Date(curr.tpep_dropoff_datetime).getUTCHours();
const pickupHour = new Date(curr.pickup_datetime).getUTCHours();
const dropoffHour = new Date(curr.dropoff_datetime).getUTCHours();

const pickupLongitude = Number(curr.pickup_longitude);
const pickupLatitude = Number(curr.pickup_latitude);
Expand Down
10,008 changes: 0 additions & 10,008 deletions src/demos/building-a-geospatial-app/data/taxi.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/demos/custom-layers/1-combination-layer/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {Component} from 'react';
import MapGL from 'react-map-gl';
import DeckGLOverlay from './deckgl-overlay';

import taxiData from '../../data/taxi';
import taxiData from '../../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
2 changes: 1 addition & 1 deletion src/demos/custom-layers/2-adaptor-layer/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {Component} from 'react';
import MapGL from 'react-map-gl';
import DeckGLOverlay from './deckgl-overlay';

import taxiData from '../../data/taxi';
import taxiData from '../../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
2 changes: 1 addition & 1 deletion src/demos/custom-layers/3-custom-shader/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {Component} from 'react';
import MapGL from 'react-map-gl';
import DeckGLOverlay from './deckgl-overlay';

import taxiData from '../../data/taxi';
import taxiData from '../../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
2 changes: 1 addition & 1 deletion src/demos/custom-layers/4-custom-attribute/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {Component} from 'react';
import MapGL from 'react-map-gl';
import DeckGLOverlay from './deckgl-overlay';

import taxiData from '../../data/taxi';
import taxiData from '../../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
2 changes: 1 addition & 1 deletion src/demos/custom-layers/5-custom-uniform/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, {Component} from 'react';
import MapGL from 'react-map-gl';
import DeckGLOverlay from './deckgl-overlay';

import taxiData from '../../data/taxi';
import taxiData from '../../../data/taxi';

const MAPBOX_STYLE = 'mapbox://styles/mapbox/dark-v9';
// Set your mapbox token here
Expand Down
Loading

0 comments on commit 9fa78c8

Please sign in to comment.