Skip to content

Commit 9afbb3f

Browse files
committed
Update
1 parent ff2c37b commit 9afbb3f

File tree

8 files changed

+146
-69
lines changed

8 files changed

+146
-69
lines changed

.idea/workspace.xml

+134-59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/main.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ tr:last-child td:last-child { border-bottom-right-radius: 10px; }
121121
text-align: center;
122122
}
123123

124-
#loading-image {
124+
#loadingImage {
125125
transition: all 0.8s;
126126
position: absolute;
127127
top: 100px;
File renamed without changes.
File renamed without changes.

index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<a>Earthquake Situational Analytics</a>
1616
</div>
1717
<div id="loading">
18-
<img id="loading-image" height="130" width="150"
19-
src="images/spinnerResource.gif" alt="Loading..."/>
18+
<img id="loadingImage" height="130" width="150" alt="Loading..."/>
2019
</div>
2120
<div id="mainContent"></div>
2221
<script src="js/source.js"></script>

js/main.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ const endDate = Date.parse("2020-04-10 11:59:00");
33
const hourToMS = 60 * 60 * 1000;
44
const streamStepUnit = 0.5; // half hour
55
const formatTimeLegend = d3.timeFormat("%B %d, %-I:%M:%S %p");
6-
// const formatTimeReadData = d3.timeFormat("%Y %B %d %-I%p");
7-
const formatTimeReadData = d3.timeFormat("%-m/%-d %-I%p");
6+
const formatTimeWS = d3.timeFormat("%-m/%-d %-I%p");
87
const formatTimeDetailBox = d3.timeFormat("%B %d, %-I:%M %p");
98
const topics = ["message", "location"];
109
const topicColor = ["#919191", "#770000"];
1110
const margin = {top: 30, right: 20, bottom: 50, left: 50},
1211
width = 1200 - margin.left - margin.right,
1312
height = 500 - margin.top - margin.bottom;
14-
const initTimestamp = 1586364211000;
13+
const initTimestamp = 1586344602000;
1514
const bisect = d3.bisector(d => {
1615
return d.time
1716
}).left;
18-
const initOption = "resource";
1917
const columns = ["time", "location", "account", "message"];
2018
const firstStrike = [1586200114000, 1586204242000];
2119
const secondStrike = [1586350794000, 1586356642000];
@@ -187,7 +185,7 @@ function getWSdata(rangedData) {
187185
rangedData.forEach(d => {
188186
let thisHour = nearestHour(d.time);
189187
timeObj[thisHour] = true;
190-
let date = formatTimeReadData(new Date(d.time));
188+
let date = formatTimeWS(new Date(d.time));
191189

192190
let wordArray = splitText(d.message);
193191

js/panel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function drawPanel(){
2828
.append("div")
2929
.attr("id", "configurationContainer")
3030
.attr("class", "floatingBox")
31-
.style("left", (margin.left + 2) + "px")
31+
.style("left", (margin.left + 1) + "px")
3232
.style("top", 10 + "px");
3333

3434
d3.selectAll(".floatingBox").call(d3.drag()
@@ -50,7 +50,7 @@ function drawPanel(){
5050

5151
let svgPanel = panelContent.append("svg")
5252
.attr("width", 380)
53-
.attr("height", 350);
53+
.attr("height", 340);
5454

5555
let legend = svgPanel
5656
.append("g");

js/source.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)