Adding HW 4
This commit is contained in:
21
hw2/.idea/workspace.xml
generated
21
hw2/.idea/workspace.xml
generated
@@ -1,9 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a11ee4a0-3787-4da9-80ca-2e586b2721a1" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
</list>
|
||||
<list default="true" id="a11ee4a0-3787-4da9-80ca-2e586b2721a1" name="Default Changelist" comment="" />
|
||||
<ignored path="$PROJECT_DIR$/.tmp/" />
|
||||
<ignored path="$PROJECT_DIR$/temp/" />
|
||||
<ignored path="$PROJECT_DIR$/tmp/" />
|
||||
@@ -17,12 +15,12 @@
|
||||
<session id="-371711873">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.closed" value="4" />
|
||||
<entry key="project.open.time.10" value="1" />
|
||||
<entry key="project.closed" value="5" />
|
||||
<entry key="project.open.time.10" value="2" />
|
||||
<entry key="project.open.time.12" value="1" />
|
||||
<entry key="project.open.time.4" value="1" />
|
||||
<entry key="project.open.time.9" value="1" />
|
||||
<entry key="project.opened" value="4" />
|
||||
<entry key="project.opened" value="5" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
@@ -79,7 +77,7 @@
|
||||
<entry file="file://$PROJECT_DIR$/js/Tree.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="295">
|
||||
<caret line="83" column="32" lean-forward="true" selection-start-line="81" selection-start-column="8" selection-end-line="83" selection-end-column="32" />
|
||||
<caret line="83" column="32" selection-start-line="81" selection-start-column="8" selection-end-line="83" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -210,11 +208,12 @@
|
||||
<workItem from="1568614403562" duration="1200000" />
|
||||
<workItem from="1568644410386" duration="12289000" />
|
||||
<workItem from="1568850914755" duration="490000" />
|
||||
<workItem from="1569214023850" duration="98000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="18794000" />
|
||||
<option name="totallyTimeSpent" value="18892000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -228,7 +227,7 @@
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="23" width="1280" height="731" extended-state="0" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2494043" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2494043" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
@@ -240,7 +239,7 @@
|
||||
<window_info anchor="bottom" id="TODO" order="6" weight="0.3286385" />
|
||||
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
|
||||
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3286385" />
|
||||
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3286385" />
|
||||
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
@@ -311,7 +310,7 @@
|
||||
<entry file="file://$PROJECT_DIR$/js/Tree.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="295">
|
||||
<caret line="83" column="32" lean-forward="true" selection-start-line="81" selection-start-column="8" selection-end-line="83" selection-end-column="32" />
|
||||
<caret line="83" column="32" selection-start-line="81" selection-start-column="8" selection-end-line="83" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
141
hw3/.idea/workspace.xml
generated
141
hw3/.idea/workspace.xml
generated
@@ -2,13 +2,15 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d913f462-7721-4324-b281-53f1a4bb289e" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/../hw2/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../hw2/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/script.js" beforeDir="false" afterPath="$PROJECT_DIR$/script.js" afterDir="false" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../hw2/.idea/workspace.xml" afterPath="$PROJECT_DIR$/../hw2/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/hw3.html" afterPath="$PROJECT_DIR$/hw3.html" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/.tmp/" />
|
||||
<ignored path="$PROJECT_DIR$/temp/" />
|
||||
<ignored path="$PROJECT_DIR$/tmp/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="TRACKING_ENABLED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
@@ -18,7 +20,7 @@
|
||||
<session id="-568225377">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.closed" value="1" />
|
||||
<entry key="project.closed" value="2" />
|
||||
<entry key="project.open.time.1" value="1" />
|
||||
<entry key="project.open.time.6" value="1" />
|
||||
<entry key="project.opened" value="2" />
|
||||
@@ -49,21 +51,13 @@
|
||||
</session>
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<leaf>
|
||||
<file leaf-file-name="hw3.html" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/hw3.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-575">
|
||||
<caret line="99" column="84" selection-start-line="99" selection-start-column="84" selection-end-line="99" selection-end-column="84" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/script.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
|
||||
<state relative-caret-position="15">
|
||||
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -91,7 +85,6 @@
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/hw3.html" />
|
||||
<option value="$PROJECT_DIR$/script.js" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -108,11 +101,24 @@
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectView">
|
||||
<navigator proportions="" version="1">
|
||||
<navigator currentView="ProjectPane" proportions="" version="1">
|
||||
<flattenPackages />
|
||||
<showMembers />
|
||||
<showModules />
|
||||
<showLibraryContents />
|
||||
<hideEmptyPackages />
|
||||
<abbreviatePackageNames />
|
||||
<autoscrollToSource />
|
||||
<autoscrollFromSource />
|
||||
<sortByType />
|
||||
<manualOrder />
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scratches" />
|
||||
<pane id="AndroidView" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -124,8 +130,6 @@
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="AndroidView" />
|
||||
<pane id="PackagesPane" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@@ -155,18 +159,16 @@
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="ChromiumRemoteDebugType" factoryName="Chromium Remote" port="9001">
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="Unnamed" type="NodeJSConfigurationType" factoryName="Node.js" path-to-js-file="script.js" working-dir="$PROJECT_DIR$">
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="Unnamed" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" path-to-js-file="script.js" working-dir="$PROJECT_DIR$" />
|
||||
<configuration default="true" type="ChromiumRemoteDebugType" factoryName="Chromium Remote" port="9001" />
|
||||
<configuration default="true" type="js.build_tools.grunt" factoryName="Grunt.js">
|
||||
<node-interpreter value="project" />
|
||||
<envs />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="ShelveChangesManager" show_recycled="false">
|
||||
<option name="remove_strategy" value="false" />
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
@@ -178,46 +180,43 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1569214123580</updated>
|
||||
<workItem from="1569214124878" duration="389000" />
|
||||
<workItem from="1569214556532" duration="97000" />
|
||||
<workItem from="1569214674667" duration="19653000" />
|
||||
<workItem from="1569214556532" duration="10423000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="20139000" />
|
||||
<option name="totallyTimeSpent" value="20171000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1280" height="800" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<frame x="0" y="23" width="1280" height="731" extended-state="0" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2494043" />
|
||||
<window_info id="Structure" order="1" weight="0.25" />
|
||||
<window_info id="Image Layers" order="2" />
|
||||
<window_info id="Designer" order="3" />
|
||||
<window_info id="UI Designer" order="4" />
|
||||
<window_info id="Capture Tool" order="5" />
|
||||
<window_info id="Favorites" order="6" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32876712" />
|
||||
<window_info anchor="bottom" id="Run" order="2" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" />
|
||||
<window_info anchor="bottom" id="Version Control" order="7" />
|
||||
<window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.28767124" />
|
||||
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
|
||||
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
<window_info anchor="right" id="Palette" order="3" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="4" />
|
||||
<window_info anchor="right" id="Cargo" order="5" />
|
||||
<window_info anchor="right" id="Theme Preview" order="6" />
|
||||
<window_info anchor="right" id="Database" order="7" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
<window_info anchor="right" id="Maven Projects" order="9" />
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cargo" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959612" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
@@ -226,21 +225,31 @@
|
||||
<component name="VcsContentAnnotationSettings">
|
||||
<option name="myLimit" value="2678400000" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager />
|
||||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/d3.js">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
<entry file="file://$PROJECT_DIR$/hw3.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/hw3.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-575">
|
||||
<caret line="99" column="84" selection-start-line="99" selection-start-column="84" selection-end-line="99" selection-end-column="84" />
|
||||
<state relative-caret-position="15">
|
||||
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/script.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
|
||||
<state relative-caret-position="193">
|
||||
<caret line="154" column="25" lean-forward="true" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
|
||||
12
hw4/.idea/hw4.iml
generated
Normal file
12
hw4/.idea/hw4.iml
generated
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="WEB_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
5
hw4/.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
5
hw4/.idea/inspectionProfiles/profiles_settings.xml
generated
Normal file
@@ -0,0 +1,5 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="PROJECT_PROFILE" />
|
||||
</settings>
|
||||
</component>
|
||||
6
hw4/.idea/misc.xml
generated
Normal file
6
hw4/.idea/misc.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavaScriptSettings">
|
||||
<option name="languageLevel" value="ES6" />
|
||||
</component>
|
||||
</project>
|
||||
8
hw4/.idea/modules.xml
generated
Normal file
8
hw4/.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/hw4.iml" filepath="$PROJECT_DIR$/.idea/hw4.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
7
hw4/.idea/workspace.xml
generated
Normal file
7
hw4/.idea/workspace.xml
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="PropertiesComponent">
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
BIN
hw4/assets/fifa_russia_logo.png
Normal file
BIN
hw4/assets/fifa_russia_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.8 KiB |
BIN
hw4/assets/font1.ttf
Executable file
BIN
hw4/assets/font1.ttf
Executable file
Binary file not shown.
BIN
hw4/assets/font2.ttf
Executable file
BIN
hw4/assets/font2.ttf
Executable file
Binary file not shown.
5505
hw4/assets/gold.svg
Normal file
5505
hw4/assets/gold.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 481 KiB |
3864
hw4/assets/silver.svg
Normal file
3864
hw4/assets/silver.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 358 KiB |
21
hw4/data/fifa-world-cup.csv
Normal file
21
hw4/data/fifa-world-cup.csv
Normal file
@@ -0,0 +1,21 @@
|
||||
EDITION,YEAR,host,host_country_code,winner,WIN_LAT,WIN_LON,runner_up,RUP_LAT,RUP_LON,TEAMS,MATCHES,GOALS,AVERAGE_GOALS,AVERAGE_ATTENDANCE,TEAM_NAMES,TEAM_LIST
|
||||
2014 FIFA World Cup Brazil,2014,Brazil,BRA,Germany,52.52,13.405,Argentina,-34.6037,-58.3816,32,64,171,2.7,52918,"Algeria,Cameroon,Cote d'Ivoire,Ghana,Nigeria,Australia,Iran,Japan,KoreaRepublic,Belgium,Bosnia, Herzegovina, Croatia,England,France,Germany,Greece,Italy,Netherlands, Portugal,Russia,Spain,Switzerland,Costa Rica,Honduras,Mexico,USA,Argentina,Brazil,Chile,Colombia,Ecuador,Uruguay","DZA,CMR,CIV,GHA,NGA,AUS,IRN,JPN,KOR,BEL,BIH,HRV,GBR,FRA,DEU,GRC,ITA,NLD,PRT,RUS,ESP,CHE,CRI,HND,MEX,USA,ARG,BRA,CHL,COL,ECU,URY"
|
||||
2010 FIFA World Cup South Africa ,2010,South Africa,ZAF,Spain,40.4168,-3.7038,Netherlands,52.3702,4.8952,32,64,145,2.3,49669,"Algeria,Cameroon,Ghana,Ivory Coast,Nigeria,South Africa,Australia,Japan,Korea DPR,Korea Republic,Denmark,England,France,Germany,Greece,Italy,Netherlands,Portugal,Serbia,Slovakia,Slovenia,Spain,Switzerland,Honduras,Mexico,USA,New Zealand,Argentina,Brazil,Chile,Paraguay,Uruguay","DZA,CMR,GHA,NGA,ZAF,AUS,JPN,KOR,KOR,DNK,GBR,FRA,DEU,GRC,ITA,NLD,PRT,SRB,SVK,SVN,ESP,CHE,HND,MEX,USA,NZL,ARG,BRA,CHL,PRY,URY"
|
||||
2006 FIFA World Cup Germany ,2006,Germany,DEU,Italy,41.9028,12.4964,France,48.8566,2.3522,32,64,147,2.3,52491,"Angola,Ghana,Ivory Coast,Togo,Tunisia,Australia,Iran,Japan,Korea Republic,Saudi Arabia,Croatia,Czech Republic,England,France,Germany,Italy,Netherlands,Poland,Portugal,Serbia and Montenegro,Spain,Sweden,Switzerland,Ukraine,Costa Rica,Mexico,Trinidad and Tobago,USA,Argentina,Brazil,Ecuador,Paraguay","AGO,GHA,TGO,TUN,AUS,IRN,JPN,KOR,SAU,HRV,CZE,GBR,FRA,DEU,ITA,NLD,POL,PRT,ESP,SWE,CHE,UKR,CRI,MEX,TTO,USA,ARG,BRA,ECU,PRY"
|
||||
2002 FIFA World Cup Korea/Japan ,2002,Korea/Japan,KOR,Brazil,-15.7942,-47.8822,Germany,52.52,13.405,32,64,161,2.5,42268,"Cameroon,Nigeria,Senegal,South Africa,Tunisia,China PR,Japan,Korea Republic,Saudi Arabia,Belgium,Croatia,Denmark,England,France,Germany,Italy,Poland,Portugal,Republic of Ireland,Russia,Slovenia,Spain,Sweden,Turkey,Costa Rica,Mexico,USA,Argentina,Brazil,Ecuador,Paraguay,Uruguay","CMR,NGA,SEN,ZAF,TUN,CHN,JPN,KOR,SAU,BEL,HRV,DNK,GBR,FRA,DEU,ITA,POL,PRT,RUS,SVN,ESP,SWE,TUR,CRI,MEX,USA,ARG,BRA,ECU,PRY,URY"
|
||||
1998 FIFA World Cup France ,1998,France,FRA,France,48.8566,2.3522,Brazil,-15.7942,-47.8822,32,64,171,2.7,43517,"Cameroon,Morocco,Nigeria,South Africa,Tunisia,Iran,Japan,Korea Republic,Saudi Arabia,Austria,Belgium,Bulgaria,Croatia,Denmark,England,France,Germany,Italy,Netherlands,Norway,Romania,Scotland,Spain,Yugoslavia,Jamaica,Mexico,USA,Argentina,Brazil,Chile,Colombia,Paraguay","CMR,MAR,NGA,ZAF,TUN,IRN,JPN,KOR,SAU,AUT,BEL,BGR,HRV,DNK,GBR,FRA,DEU,ITA,NLD,NOR,ROU,ESP,JAM,MEX,USA,ARG,BRA,CHL,COL,PRY"
|
||||
1994 FIFA World Cup USA ,1994,USA,USA,Brazil,-15.7942,-47.8822,Italy,41.9028,12.4964,24,52,141,2.7,68991,"Cameroon,Morocco,Nigeria,Korea Republic,Saudi Arabia,Belgium,Bulgaria,Germany,Greece,Italy,Netherlands,Norway,Republic of Ireland,Romania,Russia,Spain,Sweden,Switzerland,Mexico,USA,Argentina,Bolivia,Brazil,Colombia","CMR,MAR,NGA,KOR,SAU,BEL,BGR,DEU,GRC,ITA,NLD,NOR,ROU,RUS,ESP,SWE,CHE,MEX,USA,ARG,BOL,BRA,COL"
|
||||
1990 FIFA World Cup Italy ,1990,Italy,ITA,Germany,52.52,13.405,Argentina,-34.6037,-58.3816,24,52,115,2.2,48388,"Cameroon,Egypt,Korea Republic,United Arab Emirates,Austria,Belgium,Czechoslovakia,England,Germany FR,Italy,Netherlands,Republic of Ireland,Romania,Scotland,Soviet Union,Spain,Sweden,Yugoslavia,Costa Rica,USA,Argentina,Brazil,Colombia,Uruguay","CMR,EGY,KOR,ARE,AUT,BEL,GBR,DEU,ITA,NLD,ROU,RUS,ESP,SWE,CRI,USA,ARG,BRA,COL,URY"
|
||||
1986 FIFA World Cup Mexico,1986,Mexico,MEX,Argentina,-34.6037,-58.3816,Germany,52.52,13.405,24,52,132,2.5,46039,"Algeria,Morocco,Iraq,Korea Republic,Belgium,Bulgaria,Denmark,England,France,Germany FR,Hungary,Italy,Northern Ireland,Poland,Portugal,Scotland,Soviet Union,Spain,Canada,Mexico,Argentina,Brazil,Paraguay,Uruguay","DZA,MAR,IRQ,KOR,BEL,BGR,DNK,GBR,FRA,DEU,HUN,ITA,POL,PRT,RUS,ESP,CAN,MEX,ARG,BRA,PRY,URY"
|
||||
1982 FIFA World Cup Spain ,1982,Spain,ESP,Italy,41.9028,12.4964,Germany,52.52,13.405,24,52,146,2.8,40571,"Algeria,Cameroon,Kuwait,Austria,Belgium,Czechoslovakia,England,France,Germany FR,Hungary,Italy,Northern Ireland,Poland,Scotland,Soviet Union,Spain,Yugoslavia,El Salvador,Honduras,New Zealand,Argentina,Brazil,Chile,Peru","DZA,CMR,KWT,AUT,BEL,GBR,FRA,DEU,HUN,ITA,POL,RUS,ESP,SLV,HND,NZL,ARG,BRA,CHL,PER"
|
||||
1978 FIFA World Cup Argentina ,1978,Argentina,ARG,Argentina,-34.6037,-58.3816,Netherlands,52.3702,4.8952,16,38,102,2.7,40678,"Tunisia,Iran,Austria,France,Germany FR,Hungary,Italy,Netherlands,Poland,Scotland,Spain,Sweden,Mexico,Argentina,Brazil,Peru","TUN,IRN,AUT,FRA,DEU,HUN,ITA,NLD,POL,ESP,SWE,MEX,ARG,BRA,PER"
|
||||
1974 FIFA World Cup Germany,1974,Germany,DEU,Germany,52.52,13.405,Netherlands,52.3702,4.8952,16,38,97,2.6,49098,"Zaire,Australia,Bulgaria,Germany,Italy,Netherlands,Poland,Scotland,Sweden,Yugoslavia,Haiti,Argentina,Brazil,Chile,Uruguay","AUS,BGR,DEU,ITA,NLD,POL,SWE,HTI,ARG,BRA,CHL,URY"
|
||||
1970 FIFA World Cup Mexico ,1970,Mexico,MEX,Brazil,-15.7942,-47.8822,Italy,41.9028,12.4964,16,32,95,3,50124,"Morocco,Belgium,Bulgaria,Czechoslovakia,England,Germany FR,Israel,Italy,Romania,Soviet Union,Sweden,El Salvador,Mexico,Brazil,Peru,Uruguay","MAR,BEL,BGR,GBR,DEU,ISR,ITA,ROU,RUS,SWE,SLV,MEX,BRA,PER,URY"
|
||||
1966 FIFA World Cup England ,1966,England,GBR,England,51.5074,-0.1278,Germany,52.52,13.405,16,32,89,2.8,48847,"Korea DPR,Bulgaria,England,France,Germany FR,Hungary,Italy,Portugal,Soviet Union,Spain,Switzerland,Mexico,Argentina,Brazil,Chile,Uruguay","KOR,BGR,GBR,FRA,DEU,HUN,ITA,PRT,RUS,ESP,CHE,MEX,ARG,BRA,CHL,URY"
|
||||
1962 FIFA World Cup Chile ,1962,Chile,CHL,Brazil,-15.7942,-47.8822,Czechoslovakia,50.0755,14.4378,16,32,89,2.8,27911,"Bulgaria,Czechoslovakia,England,Germany FR,Hungary,Italy,Soviet Union,Spain,Switzerland,Yugoslavia,Mexico,Argentina,Brazil,Chile,Colombia,Uruguay","BGR,GBR,DEU,HUN,ITA,RUS,ESP,CHE,MEX,ARG,BRA,CHL,COL,URY"
|
||||
1958 FIFA World Cup Sweden ,1958,Sweden,SWE,Brazil,-15.7942,-47.8822,Sweden,59.3293,18.0686,16,35,126,3.6,23423,"Austria,Czechoslovakia,England,France,Germany FR,Hungary,Northern Ireland,Scotland,Soviet Union,Sweden,Wales,Yugoslavia,Mexico,Argentina,Brazil,Paraguay","AUT,GBR,FRA,DEU,HUN,RUS,SWE,MEX,ARG,BRA,PRY"
|
||||
1954 FIFA World Cup Switzerland ,1954,Switzerland,CHE,Germany,52.52,13.405,Hungary,47.4979,19.0402,16,26,140,5.4,29561,"Korea Republic,Austria,Belgium,Czechoslovakia,England,France,Germany FR,Hungary,Italy,Scotland,Switzerland,Turkey,Yugoslavia,Mexico,Brazil,Uruguay","KOR,AUT,BEL,GBR,FRA,DEU,HUN,ITA,CHE,TUR,MEX,BRA,URY"
|
||||
1950 FIFA World Cup Brazil ,1950,Brazil,BRA,Uruguay,-34.9011,-56.1645,Brazil,-15.7942,-47.8822,13,22,88,4,47511,"England,Italy,Spain,Sweden,Switzerland,Yugoslavia,Mexico,USA,Bolivia,Brazil,Chile,Paraguay,Uruguay","GBR,ITA,ESP,SWE,CHE,MEX,USA,BOL,BRA,CHL,PRY,URY"
|
||||
1938 FIFA World Cup France ,1938,France,FRA,Italy,41.9028,12.4964,Hungary,47.4979,19.0402,15,18,84,4.7,20872,"Dutch East Indies,Belgium,Czechoslovakia,France,Germany,Hungary,Italy,Netherlands,Norway,Poland,Romania,Sweden,Switzerland,Cuba,Brazil","BEL,FRA,DEU,HUN,ITA,NLD,NOR,POL,ROU,SWE,CHE,CUB,BRA"
|
||||
1934 FIFA World Cup Italy ,1934,Italy,ITA,Italy,41.9028,12.4964,Czechoslovakia,50.0755,14.4378,16,17,70,4.1,21352,"Egypt,Austria,Belgium,Czechoslovakia,France,Germany,Hungary,Italy,Netherlands,Romania,Spain,Sweden,Switzerland,USA,Argentina,Brazil","EGY,AUT,BEL,FRA,DEU,HUN,ITA,NLD,ROU,ESP,SWE,CHE,USA,ARG,BRA"
|
||||
1930 FIFA World Cup Uruguay ,1930,Uruguay,URY,Uruguay,-34.9011,-56.1645,Argentina,-34.6037,-58.3816,13,18,70,3.9,32808,"Belgium,France,Romania,Yugoslavia,Mexico,USA,Argentina,Bolivia,Brazil,Chile,Paraguay,Peru,Uruguay","BEL,FRA,ROU,MEX,USA,ARG,BOL,BRA,CHL,PRY,PER,URY"
|
||||
|
1
hw4/data/world.json
Normal file
1
hw4/data/world.json
Normal file
File diff suppressed because one or more lines are too long
BIN
hw4/figs/bar.gif
Normal file
BIN
hw4/figs/bar.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
BIN
hw4/figs/map.png
Normal file
BIN
hw4/figs/map.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 709 KiB |
BIN
hw4/figs/overview.png
Normal file
BIN
hw4/figs/overview.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
79
hw4/hw4.html
Normal file
79
hw4/hw4.html
Normal file
@@ -0,0 +1,79 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Visualization - Homework 4</title>
|
||||
<link rel="stylesheet" href="styles.css"/>
|
||||
<!--script src="https://d3js.org/d3.v5.js"></script-->
|
||||
<script src="d3.js"></script>
|
||||
<!--script src="https://cdnjs.cloudflare.com/ajax/libs/topojson/1.6.19/topojson.min.js"></script-->
|
||||
<script src="topojson.min.js"></script>
|
||||
<script src="js/infoPanel.js" async></script>
|
||||
<script src="js/barChart.js" async></script>
|
||||
<script src="js/map.js" async></script>
|
||||
<script src="js/script.js" async></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="container">
|
||||
<header>
|
||||
<img src="assets/fifa_russia_logo.png" alt="Fifa WC Russia Logo" id="logo"/>
|
||||
<h1>Exploring FIFA World Cup Statistics: CS-5630/6630 Homework 4</h1>
|
||||
<div>Name: YOURNAME; E-Mail: YOUREMAIL; A#: A12345678</div>
|
||||
</header>
|
||||
|
||||
<div id="details" class="view">
|
||||
<h2 id="edition">World Cup Title</h2>
|
||||
<h3>Host</h3>
|
||||
<span id="host"></span>
|
||||
<h3>Winner</h3>
|
||||
<span id="winner"></span>
|
||||
<h3>Silver</h3>
|
||||
<span id="silver"></span>
|
||||
<h3>Teams</h3>
|
||||
<span id="teams"></span>
|
||||
</div>
|
||||
|
||||
<div id="bar-chart" class="view">
|
||||
<h2 class="">Bar Chart</h2>
|
||||
<div id="plot-selector">
|
||||
<label>Plot:</label>
|
||||
<select id="dataset" onchange="chooseData()">
|
||||
<option selected value="attendance">Attendance</option>
|
||||
<option value="teams">Teams</option>
|
||||
<option value="matches">Matches</option>
|
||||
<option value="goals">Goals</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<svg width="500" height="400" id="barChart">
|
||||
<g id="xAxis"></g>
|
||||
<g id="yAxis"></g>
|
||||
<g id="bars"></g>
|
||||
</svg>
|
||||
</div>
|
||||
|
||||
<div id="map-view" class="view">
|
||||
<h2>World Map</h2>
|
||||
|
||||
<svg width="400" height="30">
|
||||
<rect class="host legend-element" x="0" y="5" ></rect>
|
||||
<text x="18" y="18">Host</text>
|
||||
<rect class="team legend-element" x="60" y="5" ></rect>
|
||||
<text x="78" y="18">Participant</text>
|
||||
<circle class="gold" cx="176" cy="12" r="8"></circle>
|
||||
<text x="188" y="18">Winner</text>
|
||||
<circle class="silver" cx="258" cy="12" r="8" ></circle>
|
||||
<text x="270" y="18">Runner-Up</text>
|
||||
</svg>
|
||||
|
||||
<svg width="900" height="600">
|
||||
<g id="map"> </g>
|
||||
<g id="points"></g>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
55
hw4/js/barChart.js
Normal file
55
hw4/js/barChart.js
Normal file
@@ -0,0 +1,55 @@
|
||||
/** Class implementing the bar chart view. */
|
||||
class BarChart {
|
||||
|
||||
/**
|
||||
* Create a bar chart instance and pass the other views in.
|
||||
* @param worldMap
|
||||
* @param infoPanel
|
||||
* @param allData
|
||||
*/
|
||||
constructor(worldMap, infoPanel, allData) {
|
||||
this.worldMap = worldMap;
|
||||
this.infoPanel = infoPanel;
|
||||
this.allData = allData;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render and update the bar chart based on the selection of the data type in the drop-down box
|
||||
*/
|
||||
updateBarChart(selectedDimension) {
|
||||
// ******* TODO: PART I *******
|
||||
|
||||
// Create the x and y scales; make
|
||||
// sure to leave room for the axes
|
||||
|
||||
|
||||
// Create colorScale
|
||||
|
||||
// Create the axes (hint: use #xAxis and #yAxis)
|
||||
|
||||
// Create the bars (hint: use #bars)
|
||||
|
||||
|
||||
// ******* TODO: PART II *******
|
||||
|
||||
// Implement how the bars respond to click events
|
||||
// Color the selected bar to indicate is has been selected.
|
||||
// Make sure only the selected bar has this new color.
|
||||
|
||||
// Call the necessary update functions for when a user clicks on a bar.
|
||||
// Note: think about what you want to update when a different bar is selected.
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Check the drop-down box for the currently selected data type and update the bar chart accordingly.
|
||||
*
|
||||
* There are 4 attributes that can be selected:
|
||||
* goals, matches, attendance and teams.
|
||||
*/
|
||||
chooseData() {
|
||||
// ******* TODO: PART I *******
|
||||
//Changed the selected data when a user selects a different
|
||||
// menu item from the drop down.
|
||||
}
|
||||
}
|
||||
27
hw4/js/infoPanel.js
Normal file
27
hw4/js/infoPanel.js
Normal file
@@ -0,0 +1,27 @@
|
||||
/** Class implementing the infoPanel view. */
|
||||
class InfoPanel {
|
||||
/**
|
||||
* Creates a infoPanel Object
|
||||
*/
|
||||
constructor() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the info panel to show info about the currently selected world cup
|
||||
* @param oneWorldCup the currently selected world cup
|
||||
*/
|
||||
updateInfo(oneWorldCup) {
|
||||
|
||||
// ******* TODO: PART III *******
|
||||
|
||||
// Update the text elements in the infoBox to reflect:
|
||||
// World Cup Title, host, winner, runner_up, and all participating teams that year
|
||||
|
||||
// Hint: For the list of teams, you can create an list element for each team.
|
||||
// Hint: Select the appropriate ids to update the text content.
|
||||
|
||||
//Set Labels
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
78
hw4/js/map.js
Normal file
78
hw4/js/map.js
Normal file
@@ -0,0 +1,78 @@
|
||||
/** Class implementing the map view. */
|
||||
class Map {
|
||||
/**
|
||||
* Creates a Map Object
|
||||
*/
|
||||
constructor() {
|
||||
this.projection = d3.geoConicConformal().scale(150).translate([400, 350]);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Function that clears the map
|
||||
*/
|
||||
clearMap() {
|
||||
|
||||
// ******* TODO: PART V*******
|
||||
// Clear the map of any colors/markers; You can do this with inline styling or by
|
||||
// defining a class style in styles.css
|
||||
|
||||
// Hint: If you followed our suggestion of using classes to style
|
||||
// the colors and markers for hosts/teams/winners, you can use
|
||||
// d3 selection and .classed to set these classes on and off here.
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Update Map with info for a specific FIFA World Cup
|
||||
* @param wordcupData the data for one specific world cup
|
||||
*/
|
||||
updateMap(worldcupData) {
|
||||
|
||||
//Clear any previous selections;
|
||||
this.clearMap();
|
||||
|
||||
// ******* TODO: PART V *******
|
||||
|
||||
// Add a marker for the winner and runner up to the map.
|
||||
|
||||
// Hint: remember we have a conveniently labeled class called .winner
|
||||
// as well as a .silver. These have styling attributes for the two
|
||||
// markers.
|
||||
|
||||
|
||||
// Select the host country and change it's color accordingly.
|
||||
|
||||
// Iterate through all participating teams and change their color as well.
|
||||
|
||||
// We strongly suggest using CSS classes to style the selected countries.
|
||||
|
||||
|
||||
// Add a marker for gold/silver medalists
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the actual map
|
||||
* @param the json data with the shape of all countries
|
||||
*/
|
||||
drawMap(world) {
|
||||
|
||||
//(note that projection is a class member
|
||||
// updateMap() will need it to add the winner/runner_up markers.)
|
||||
|
||||
// ******* TODO: PART IV *******
|
||||
|
||||
// Draw the background (country outlines; hint: use #map).
|
||||
// You will need to convert the topoJSON file to geoJSON.
|
||||
// Make sure and add gridlines to the map.
|
||||
|
||||
// Hint: assign an id to each country path to make it easier to select afterwards
|
||||
// we suggest you use the variable in the data element's .id field to set the id
|
||||
|
||||
// Make sure and give your paths the appropriate class (see the .css selectors at
|
||||
// the top of the provided html file)
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
50
hw4/js/script.js
Normal file
50
hw4/js/script.js
Normal file
@@ -0,0 +1,50 @@
|
||||
|
||||
// Load CSV file
|
||||
d3.csv("data/fifa-world-cup.csv", function (d) {
|
||||
// Convert numeric values to 'numbers'
|
||||
d.year = +d.YEAR;
|
||||
d.teams = +d.TEAMS;
|
||||
d.matches = +d.MATCHES;
|
||||
d.goals = +d.GOALS;
|
||||
d.avg_goals = +d.AVERAGE_GOALS;
|
||||
d.attendance = +d.AVERAGE_ATTENDANCE;
|
||||
// Lat and Lons of gold and silver medals teams
|
||||
d.win_pos = [+d.WIN_LON, +d.WIN_LAT];
|
||||
d.ru_pos = [+d.RUP_LON, +d.RUP_LAT];
|
||||
|
||||
//Break up lists into javascript arrays
|
||||
d.teams_iso = d3.csvParse(d.TEAM_LIST).columns;
|
||||
d.teams_names = d3.csvParse(d.TEAM_NAMES).columns;
|
||||
return d;
|
||||
}).then(function(allData) {
|
||||
|
||||
/* Create infoPanel, barChart and Map objects */
|
||||
let infoPanel = new InfoPanel();
|
||||
let worldMap = new Map();
|
||||
|
||||
/* DATA LOADING */
|
||||
//Load in json data to make map
|
||||
d3.json("data/world.json")
|
||||
.then(function(world) {
|
||||
worldMap.drawMap(world);
|
||||
});
|
||||
|
||||
// Define this as a global variable
|
||||
window.barChart = new BarChart(worldMap, infoPanel, allData);
|
||||
|
||||
// Draw the Bar chart for the first time
|
||||
barChart.updateBarChart('attendance');
|
||||
});
|
||||
|
||||
/**
|
||||
* Check the drop-down box for the currently selected data type and update the bar chart accordingly.
|
||||
*
|
||||
* There are 4 attributes that can be selected:
|
||||
* goals, matches, attendance and teams.
|
||||
*/
|
||||
function chooseData() {
|
||||
// ******* TODO: PART I *******
|
||||
// Changed the selected data when a user selects a different
|
||||
// menu item from the drop down.
|
||||
|
||||
}
|
||||
146
hw4/styles.css
Normal file
146
hw4/styles.css
Normal file
@@ -0,0 +1,146 @@
|
||||
|
||||
.countries {
|
||||
stroke: #f7f7f7;
|
||||
fill: #d9d9d9;
|
||||
}
|
||||
|
||||
.legend-element {
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
}
|
||||
|
||||
.team {
|
||||
fill: #fee8c8;
|
||||
}
|
||||
|
||||
.team-html {
|
||||
background-color: #fee8c8;
|
||||
}
|
||||
|
||||
.host {
|
||||
fill: #2b8cbe;
|
||||
}
|
||||
|
||||
.gold {
|
||||
fill: #FFD700;
|
||||
opacity: .8;
|
||||
stroke: #252525;
|
||||
stroke-width: 2px;
|
||||
}
|
||||
|
||||
.silver {
|
||||
fill: #d9d9d9;
|
||||
opacity: .8;
|
||||
stroke: #252525;
|
||||
}
|
||||
|
||||
.selected {
|
||||
fill: #d20a11;
|
||||
}
|
||||
|
||||
/*Map grid style*/
|
||||
.grat {
|
||||
stroke: grey;
|
||||
stroke-width: 1px;
|
||||
opacity: .2;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'font2';
|
||||
src: url('assets/font2.ttf');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'font1';
|
||||
src: url('assets/font1.ttf');
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin-top: 0;
|
||||
font-family: 'font2';
|
||||
color: #d20a11;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-family: 'font2';
|
||||
color: #d20a11;
|
||||
padding-bottom: 0;
|
||||
margin-top: 3px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
h3 {
|
||||
padding-bottom: 0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: 'font1';
|
||||
}
|
||||
|
||||
header {
|
||||
padding: 0.5em;
|
||||
clear: left;
|
||||
text-align: left;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
#logo {
|
||||
float: right;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
|
||||
#plot-selector {
|
||||
float: right;
|
||||
margin-bottom: 5px;
|
||||
|
||||
}
|
||||
|
||||
.view {
|
||||
padding: 0.5em;
|
||||
|
||||
}
|
||||
|
||||
|
||||
#details {
|
||||
width: 200px;
|
||||
padding: 0.5em;
|
||||
float: left;
|
||||
|
||||
border-width: 1px;
|
||||
border-color: #d9d9d9;
|
||||
border-right-style: solid;
|
||||
}
|
||||
|
||||
#bar-chart {
|
||||
width: 500px;
|
||||
margin-right: 20px;
|
||||
float: left;
|
||||
|
||||
}
|
||||
|
||||
#map-view {
|
||||
margin-left: 750px;
|
||||
width: 910px;
|
||||
border-width: 1px;
|
||||
border-color: #d9d9d9;
|
||||
border-left-style: solid;
|
||||
}
|
||||
|
||||
|
||||
#links > line {
|
||||
stroke: rgb(216, 216, 216);
|
||||
}
|
||||
|
||||
#xAxis path,
|
||||
#yAxis path {
|
||||
fill: none;
|
||||
stroke: black;
|
||||
}
|
||||
|
||||
#xAxis text,
|
||||
#yAxis text {
|
||||
font-size: 14px;
|
||||
|
||||
}
|
||||
1
hw4/topojson.min.js
vendored
Normal file
1
hw4/topojson.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user