Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test PR before PR to upstream #134

Closed
wants to merge 1,461 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
1461 commits
Select commit Hold shift + click to select a range
d129783
Merge pull request #136 from edwardchalstrey1/use-seshatid-for-colour
edwardchalstrey1 May 14, 2024
a717eaa
Revert "Use Seshat ID for colour where possible"
edwardchalstrey1 May 14, 2024
2bbcf82
Merge pull request #137 from edwardchalstrey1/revert-136-use-seshatid…
edwardchalstrey1 May 14, 2024
3e4e766
include leaders
edwardchalstrey1 May 15, 2024
60eb456
finish prev commit
edwardchalstrey1 May 15, 2024
63b1120
add component info to polity map
edwardchalstrey1 May 15, 2024
5498aaa
make border weight for polity map 2
edwardchalstrey1 May 15, 2024
54e3745
add groups
edwardchalstrey1 May 15, 2024
0178202
include all geoms
edwardchalstrey1 May 15, 2024
402182c
Merge pull request #139 from edwardchalstrey1/avoid-gaps
edwardchalstrey1 May 15, 2024
53c07f5
restrict RT
edwardchalstrey1 May 16, 2024
9654832
2014
edwardchalstrey1 May 16, 2024
720f93b
Merge pull request #144 from edwardchalstrey1/restrict-rt-and-recent-…
edwardchalstrey1 May 16, 2024
83bce4f
Merge pull request #145 from edwardchalstrey1/Qing
edwardchalstrey1 May 16, 2024
4397a6f
add django_recaptcha to requirements
edwardchalstrey1 May 16, 2024
6aede86
ignore django_recaptcha for local running app
edwardchalstrey1 May 16, 2024
b7c8b9e
rebuild docker image when change to requirements.txt
edwardchalstrey1 May 16, 2024
8b2b56b
Merge pull request #146 from edwardchalstrey1/recaptcha
edwardchalstrey1 May 16, 2024
cbd2305
set categorical variable selection in world_map.html based on stored …
edwardchalstrey1 May 16, 2024
4f1b73b
Merge pull request #148 from edwardchalstrey1/correct-categorical-var…
edwardchalstrey1 May 16, 2024
979755b
add a dictionary for present/absent years for each var
edwardchalstrey1 May 20, 2024
4533612
attempt to make the prev commit more efficient
edwardchalstrey1 May 20, 2024
92871cc
colour setting for variables in world map works as expected for all s…
edwardchalstrey1 May 20, 2024
2e339b0
remove console logs
edwardchalstrey1 May 20, 2024
781831e
Add present/absent years to tooltip
edwardchalstrey1 May 20, 2024
50ec3e6
filter by polity.id properly
edwardchalstrey1 May 20, 2024
fe1fd51
remove if len(variable_dict) > 1:
edwardchalstrey1 May 20, 2024
ec50ae1
got the correct vars (printing)
edwardchalstrey1 May 20, 2024
82bfe5d
get the correct info in correct dict structure
edwardchalstrey1 May 20, 2024
1003696
add variable_obj_2 as the saved dict
edwardchalstrey1 May 20, 2024
fecbfc2
set colour using shape[variable + '_dict']
edwardchalstrey1 May 20, 2024
0e9448a
update tooltip
edwardchalstrey1 May 20, 2024
f4f78a8
add years to absent/present selection
edwardchalstrey1 May 21, 2024
0b6f027
handle dicts with strings correctly
edwardchalstrey1 May 21, 2024
2ab9b41
temp uncomment RT
edwardchalstrey1 May 21, 2024
7447554
handle RT
edwardchalstrey1 May 21, 2024
7369c47
restrict RT again
edwardchalstrey1 May 21, 2024
637180e
ensure RT uses _dict
edwardchalstrey1 May 21, 2024
1dc80a2
rename vars for clarity
edwardchalstrey1 May 21, 2024
88fa117
update tests to include years for absent/present vars in test_assign_…
edwardchalstrey1 May 21, 2024
537e47d
remove comment
edwardchalstrey1 May 21, 2024
928c144
remove comment
edwardchalstrey1 May 21, 2024
ecf41f1
add dictionaries with years for language vars
edwardchalstrey1 May 21, 2024
2d4dfbd
restore language test
edwardchalstrey1 May 21, 2024
7063699
use categorical var dicts properly, but hitting errors
edwardchalstrey1 May 21, 2024
0d16e17
remove if statement not needed
edwardchalstrey1 May 21, 2024
c258e33
use the non-dict categorical vars for uncoded etc
edwardchalstrey1 May 21, 2024
b969c29
show all absent/present options for a shape
edwardchalstrey1 May 21, 2024
fe85f0e
list vars without years as uncoded
edwardchalstrey1 May 21, 2024
2620725
absent from and to
edwardchalstrey1 May 21, 2024
10a7968
update comment
edwardchalstrey1 May 22, 2024
5cc643e
add comment
edwardchalstrey1 May 22, 2024
501f721
update comment
edwardchalstrey1 May 22, 2024
869df5a
update comment
edwardchalstrey1 May 22, 2024
6e75310
make legend consistent with tooltip on capitalisation
edwardchalstrey1 May 22, 2024
e028811
rename A~P to Absent then Present
edwardchalstrey1 May 22, 2024
cf603f4
consistent capitalisation
edwardchalstrey1 May 22, 2024
cc5a6b8
year uncoded
edwardchalstrey1 May 22, 2024
09a6c6c
use common func longAbsentPresentVarName
edwardchalstrey1 May 22, 2024
1bd5f1c
add comment todo
edwardchalstrey1 May 22, 2024
deeff3f
update comment
edwardchalstrey1 May 22, 2024
b0ce172
Merge pull request #150 from edwardchalstrey1/absent-present-bug
edwardchalstrey1 May 22, 2024
f28af7e
add to existing shapesData
edwardchalstrey1 May 22, 2024
1e57c4a
add id primary key to VideoShapefile
edwardchalstrey1 May 22, 2024
dfca4fd
Refactor world_map.html to add missing shapes to shapesData by ignori…
edwardchalstrey1 May 22, 2024
48efffb
add id to get_polity_shape_content
edwardchalstrey1 May 22, 2024
a6a7c03
filter properly using string conversion
edwardchalstrey1 May 22, 2024
c9ef093
add SECURE_CROSS_ORIGIN_OPENER_POLICY = None to settings
edwardchalstrey1 May 23, 2024
18c73b7
Merge branch 'dev' into extend-shapesData
edwardchalstrey1 May 23, 2024
cc71e70
rename polityMapShapesData
edwardchalstrey1 May 23, 2024
83423e8
load just british empire II first
edwardchalstrey1 May 23, 2024
5cfae14
use polityBorderWeightSelected
edwardchalstrey1 May 23, 2024
9eae6a4
set the initial year and polity and highlight it by default
edwardchalstrey1 May 23, 2024
8160a61
always redirect
edwardchalstrey1 May 23, 2024
e2d8214
remove page reload
edwardchalstrey1 May 23, 2024
7127c96
remove page reload
edwardchalstrey1 May 23, 2024
d862055
only set end year to 2014 if it's more recent for initial view
edwardchalstrey1 May 23, 2024
43fe853
update loading text
edwardchalstrey1 May 23, 2024
8d9020b
make rome default
edwardchalstrey1 May 23, 2024
665a046
ungrey play buttons
edwardchalstrey1 May 23, 2024
01b2381
add space
edwardchalstrey1 May 23, 2024
51401df
order shapes by start year
edwardchalstrey1 May 23, 2024
db14c59
remove legacy button enabling
edwardchalstrey1 May 23, 2024
073ab84
load shapes for one year as well
edwardchalstrey1 May 23, 2024
fcaa1ba
handle shape.id as int
edwardchalstrey1 May 23, 2024
42b0f79
dont update date slide for world_map_one_year
edwardchalstrey1 May 23, 2024
b43b70b
enable adding to legend in advance of all polities loading
edwardchalstrey1 May 23, 2024
3ae638b
pick a random polity
edwardchalstrey1 May 23, 2024
edbef64
random polity (with seshat id) as initial loaded works
edwardchalstrey1 May 24, 2024
492ae3e
keep defaults
edwardchalstrey1 May 24, 2024
1e2ade6
add ids for test shapes
edwardchalstrey1 May 24, 2024
2c30045
remove pointless ordering of shapes
edwardchalstrey1 May 24, 2024
293c47e
refactor view funcs
edwardchalstrey1 May 24, 2024
8983dc7
simplify
edwardchalstrey1 May 24, 2024
a92da32
further refactor of map views
edwardchalstrey1 May 24, 2024
b093ccb
Merge pull request #151 from edwardchalstrey1/extend-shapesData
edwardchalstrey1 May 24, 2024
7b9a1bf
big empires to start
edwardchalstrey1 May 24, 2024
df53cdc
supress current borders spinner
edwardchalstrey1 May 24, 2024
0a37c30
stop loading wheel after one year loaded
edwardchalstrey1 May 24, 2024
70c2eb4
bring back loading indicator when adjusting the year if not all polit…
edwardchalstrey1 May 24, 2024
b3c4732
reload world_map_one_year multiple times
edwardchalstrey1 May 24, 2024
07503fb
update gitignore to allow notebooks
edwardchalstrey1 May 31, 2024
c658042
initial setup
edwardchalstrey1 May 31, 2024
ddd9d50
note
edwardchalstrey1 Jun 3, 2024
e4ca9ba
specify 3.11
edwardchalstrey1 Jun 3, 2024
2550efa
jupyter kernel instructions
edwardchalstrey1 Jun 3, 2024
ba76735
basic notebook works
edwardchalstrey1 Jun 3, 2024
4a86dad
colours
edwardchalstrey1 Jun 3, 2024
725437d
remove extra cells
edwardchalstrey1 Jun 3, 2024
59ddce9
translucent fill
edwardchalstrey1 Jun 3, 2024
f113e92
add end years
edwardchalstrey1 Jun 3, 2024
eb64d49
load shapes for a particular year
edwardchalstrey1 Jun 3, 2024
90c4ea3
map function
edwardchalstrey1 Jun 3, 2024
daef20f
use whole world map limits
edwardchalstrey1 Jun 3, 2024
a64d349
finish prev commit
edwardchalstrey1 Jun 3, 2024
041ce53
add gadm
edwardchalstrey1 Jun 3, 2024
fa01014
use cartodb basemap
edwardchalstrey1 Jun 3, 2024
9041fbd
adjust coordinates properly for basemap
edwardchalstrey1 Jun 3, 2024
c8dd5e4
use folium
edwardchalstrey1 Jun 3, 2024
47661b2
zoom folium map correctly
edwardchalstrey1 Jun 3, 2024
0061b49
separate by colours properly
edwardchalstrey1 Jun 3, 2024
9e65ff6
add a widget for the year
edwardchalstrey1 Jun 3, 2024
cb0f8f4
add slider
edwardchalstrey1 Jun 3, 2024
8543b70
add play button non functional
edwardchalstrey1 Jun 3, 2024
63b2e97
play button works
edwardchalstrey1 Jun 3, 2024
3c04f11
create python functions script
edwardchalstrey1 Jun 3, 2024
ed95c89
move create_map to script
edwardchalstrey1 Jun 3, 2024
76acff4
remove play button bits for now
edwardchalstrey1 Jun 3, 2024
53769c6
accept duplicate plots for now
edwardchalstrey1 Jun 3, 2024
18dd38a
add popup
edwardchalstrey1 Jun 4, 2024
aa4cab8
use same logic as populate_videodata
edwardchalstrey1 Jun 4, 2024
d9fc1d0
remove unused import
edwardchalstrey1 Jun 4, 2024
d0c5f70
separate out the convert_name func
edwardchalstrey1 Jun 4, 2024
4fe4401
update comment
edwardchalstrey1 Jun 4, 2024
6e2a2e3
combine style_function into create_map
edwardchalstrey1 Jun 4, 2024
22d18b1
restore style_function
edwardchalstrey1 Jun 4, 2024
d0c9d01
add DisplayName to the gdf
edwardchalstrey1 Jun 4, 2024
c51378c
remove gadm and play/pause bits
edwardchalstrey1 Jun 4, 2024
aed92d3
create display_map function
edwardchalstrey1 Jun 4, 2024
e81869c
speed up get_polity_shape_content for loop
edwardchalstrey1 Jun 5, 2024
87f4c4d
ignore deprecated simplified_geom
edwardchalstrey1 Jun 5, 2024
fe28a12
big processing speedup but breaks personal union code
edwardchalstrey1 Jun 5, 2024
3b8ba62
remove prints
edwardchalstrey1 Jun 5, 2024
aae22b0
change geom to geom_json in tests
edwardchalstrey1 Jun 5, 2024
f087eac
temp disable hanging test
edwardchalstrey1 Jun 5, 2024
52b8884
create self.geo_square string manually
edwardchalstrey1 Jun 5, 2024
ef399c6
do things the old way for gadm
edwardchalstrey1 Jun 5, 2024
4fe8c49
speed assign_variables_to_shapes from 3.38 to 2.88 s
edwardchalstrey1 Jun 5, 2024
5d7be8a
dont run random_polity_shape when testing
edwardchalstrey1 Jun 6, 2024
47ccace
remove console logs
edwardchalstrey1 Jun 6, 2024
7411a21
Merge branch 'adjust-loading-2' into processing-speedups
edwardchalstrey1 Jun 6, 2024
d716ab5
dont load variables for first set of shapes for one year - but this m…
edwardchalstrey1 Jun 6, 2024
39a8d4b
Revert "dont load variables for first set of shapes for one year - bu…
edwardchalstrey1 Jun 6, 2024
4c2c07e
better way to handle unions
edwardchalstrey1 Jun 6, 2024
27be8b3
remove timers
edwardchalstrey1 Jun 6, 2024
1b81c26
Merge pull request #159 from edwardchalstrey1/processing-speedups
edwardchalstrey1 Jun 6, 2024
2ad9489
Fix `multipass` setup in docs
kallewesterling Jun 6, 2024
23d6c18
Switch from pg_restore to psql in macOS instructions
kallewesterling Jun 6, 2024
6a63464
moving old docs
kallewesterling Jun 10, 2024
14e3557
Dropping old docs
kallewesterling Jun 13, 2024
952119c
Adding setup of package to enable `sphinx`
kallewesterling Jun 13, 2024
f342913
Dropping old docs
kallewesterling Jun 13, 2024
f4bee6a
Adding in `sphinx`
kallewesterling Jun 13, 2024
7a9f86a
Adding in requirements
kallewesterling Jun 13, 2024
2654fcf
Updating sphinx config to remove old theme
kallewesterling Jun 13, 2024
033b316
Adding in main bulk of Sphinx files
kallewesterling Jun 13, 2024
0d12f8c
Correcting `README`
kallewesterling Jun 13, 2024
87c8269
Moving unused file that causes issues with documentation
kallewesterling Jun 13, 2024
ff1e2a9
Adding version to `__init__`
kallewesterling Jun 13, 2024
5a1a138
Ensuring new `_mycodes` directory is considered by Django still
kallewesterling Jun 13, 2024
c0308f0
Adding main bulk of docstrings
kallewesterling Jun 13, 2024
8e0a34f
Adding for consistency with other instructions
kallewesterling Jun 13, 2024
114d751
Adding helpful link to settings
kallewesterling Jun 13, 2024
b7ee6d0
Linking up the settings pages in the API documentation
kallewesterling Jun 13, 2024
251ffb0
Adding in comments about 2 models in `seshat_api` app
kallewesterling Jun 13, 2024
1aa3816
Removing placeholder texts from codebase to not confuse with document…
kallewesterling Jun 13, 2024
782d4e9
Adding instructions for how to generate docs
kallewesterling Jun 13, 2024
8963fa9
Merge pull request #161 from kallewesterling/kallewesterling/issue158
edwardchalstrey1 Jun 18, 2024
830f81c
Merge pull request #162 from kallewesterling/kallewesterling/issue160
edwardchalstrey1 Jun 18, 2024
56bdbfa
Merge branch 'dev' into clio-notebook
edwardchalstrey1 Jun 18, 2024
ba19701
Area not Area_Km2
edwardchalstrey1 Jun 18, 2024
88bf793
only simplify if you want to
edwardchalstrey1 Jun 18, 2024
b6b31c1
works with geopandas==0.13.2
edwardchalstrey1 Jun 18, 2024
828f000
geopandas instructions
edwardchalstrey1 Jun 18, 2024
c129011
Merge pull request #167 from edwardchalstrey1/clio-notebook
edwardchalstrey1 Jun 18, 2024
e5d65b5
use duration when start or end year missing for absent present vars
edwardchalstrey1 Jun 19, 2024
7182987
rename var
edwardchalstrey1 Jun 19, 2024
9f7e513
format BCE/CE correctly
edwardchalstrey1 Jun 19, 2024
10ecec7
make uncoded and no seshat page the same colour
edwardchalstrey1 Jun 19, 2024
434f886
make switch variable button consistent
edwardchalstrey1 Jun 19, 2024
dbbbc13
add speed in y/s
edwardchalstrey1 Jun 19, 2024
0e662f3
simplify instructions
edwardchalstrey1 Jun 19, 2024
a03693f
update polity map playRate to be same as world map
edwardchalstrey1 Jun 19, 2024
6066bb1
set minZoom
edwardchalstrey1 Jun 19, 2024
cfb886e
restrict map bounds
edwardchalstrey1 Jun 19, 2024
3dba145
move year slider to bottom of polity map
edwardchalstrey1 Jun 19, 2024
d276b4f
add tickmarks
edwardchalstrey1 Jun 19, 2024
b48fbcf
Revert "add tickmarks"
edwardchalstrey1 Jun 19, 2024
61f6441
add a middle year to tickmarks
edwardchalstrey1 Jun 19, 2024
8e84a83
restore 10 tickmarks
edwardchalstrey1 Jun 19, 2024
9ee279a
added ticks badly positioned
edwardchalstrey1 Jun 19, 2024
dc3c90a
correct number of tickmarks
edwardchalstrey1 Jun 19, 2024
27cfaf4
tickmarks are accurate but labels don't line up neatly
edwardchalstrey1 Jun 21, 2024
6bfc52b
center tick values
edwardchalstrey1 Jun 21, 2024
3840371
ticks perfect
edwardchalstrey1 Jun 21, 2024
910cb12
move year controls to left
edwardchalstrey1 Jun 21, 2024
b48c45f
adjust header and year
edwardchalstrey1 Jun 21, 2024
389641e
rearrange controls
edwardchalstrey1 Jun 21, 2024
6f1566f
move year into fieldset
edwardchalstrey1 Jun 21, 2024
187a7c1
put slider below map
edwardchalstrey1 Jun 21, 2024
1df3aa2
fix width issues
edwardchalstrey1 Jun 21, 2024
2675b8e
create setSliderTicks func
edwardchalstrey1 Jun 21, 2024
dc02dd8
works for world map all years but not initial
edwardchalstrey1 Jun 21, 2024
dd3cfd2
put slider at bottom of world map
edwardchalstrey1 Jun 24, 2024
d7a13b9
add tick_number as an arg
edwardchalstrey1 Jun 24, 2024
9b3c8fd
update tests to include tick_years
edwardchalstrey1 Jun 24, 2024
858d3ee
remove print
edwardchalstrey1 Jun 24, 2024
5aae546
use tick_years from django
edwardchalstrey1 Jun 24, 2024
2cd74ff
set default tick_number to 20, but 10 for polity map
edwardchalstrey1 Jun 24, 2024
fde5b2c
set slider ticks in world map
edwardchalstrey1 Jun 24, 2024
e604491
update ticks once everything loaded
edwardchalstrey1 Jun 24, 2024
40f3d26
add override_latest_year
edwardchalstrey1 Jun 24, 2024
a0760b5
show initial ticks
edwardchalstrey1 Jun 24, 2024
bbaa7d7
add comment
edwardchalstrey1 Jun 24, 2024
38f9c17
hide slider before all polities loaded
edwardchalstrey1 Jun 24, 2024
5e8f302
fix display year
edwardchalstrey1 Jun 24, 2024
bdf39f7
restore slider initially
edwardchalstrey1 Jun 24, 2024
82a6b95
improve text
edwardchalstrey1 Jun 24, 2024
4c2598d
make previous variable button smaller
edwardchalstrey1 Jun 24, 2024
3c537bc
reduce side panel width
edwardchalstrey1 Jun 24, 2024
623168d
put year at top
edwardchalstrey1 Jun 24, 2024
f6a4063
move speed to centre
edwardchalstrey1 Jun 24, 2024
4c53760
increase size of polity map window
edwardchalstrey1 Jun 24, 2024
919c706
Merge pull request #170 from edwardchalstrey1/aesthetics-19-June
edwardchalstrey1 Jun 24, 2024
6b593c3
change gadm fill colour to white
edwardchalstrey1 Jun 25, 2024
9f1fcaa
Merge branch 'Qing' into Qing-merge-25june
edwardchalstrey1 Jun 25, 2024
509f316
Merge pull request #174 from edwardchalstrey1/Qing-merge-25june
edwardchalstrey1 Jun 25, 2024
5ad872b
add sphinx-rtd-theme
edwardchalstrey1 Jun 25, 2024
07098de
Merge pull request #1 from edwardchalstrey1/adding-docstrings
kallewesterling Jun 25, 2024
4eedf06
link to pulumi docs
edwardchalstrey1 Jun 26, 2024
63a01a4
refactor pulumi stack setup doc
edwardchalstrey1 Jun 26, 2024
48c03f0
de-duplicate pulumi stack info
edwardchalstrey1 Jun 26, 2024
21ead0a
improve virtual env suggestion
edwardchalstrey1 Jun 26, 2024
305ecf3
fix rst link
edwardchalstrey1 Jun 26, 2024
caf3f61
remove hint as link wasn't working
edwardchalstrey1 Jun 26, 2024
1a1b90d
update spatialdb link again
edwardchalstrey1 Jun 26, 2024
09d519f
restore hint and fix link by adding underscore
edwardchalstrey1 Jun 26, 2024
7eb62c1
Merge branch 'dev' into adding-docstrings
edwardchalstrey1 Jun 26, 2024
7fbd27a
Merge pull request #2 from edwardchalstrey1/adding-docstrings
kallewesterling Jun 26, 2024
15d7cfe
Merge pull request #164 from kallewesterling/adding-docstrings
edwardchalstrey1 Jun 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update polity map playRate to be same as world map
  • Loading branch information
edwardchalstrey1 committed Jun 19, 2024
commit a03693f120a60eba08e4553f7e898cddaf389a98
13 changes: 11 additions & 2 deletions seshat/apps/core/templates/core/polity_map.html
Original file line number Diff line number Diff line change
@@ -28,8 +28,17 @@
<label for="playButton">Run animation:</label>
<button id="playButton" type="button" onclick="startPlay()">▶️</button>
<button id="stopButton" type="button" onclick="stopPlay()">⏸</button><br>
<label for="playRate">Animation speed:</label>
<input type="range" name="playRate" id="playRate" min="1" max="5" value="2" class="slider" onchange="plotPolities()"><br>
<label for="playRate">Speed: </label>
<input type="range" name="playRate" id="playRate" min="1" max="5" value="2" class="slider" list="tickmarks"
onchange="updateSliderValue(this.value)">
<datalist id="tickmarks">
<option value="1"></option>
<option value="2"></option>
<option value="3"></option>
<option value="4"></option>
<option value="5"></option>
</datalist>
<span id="sliderValue">5 y/s</span><br>
<label for="opacitySlide">Opacity:</label>
<input type="range" name="opacitySlide" id="opacitySlide" min="0.1" max="1" step="0.1" value="0.5" class="slider" onchange="plotPolities()" style="width: 150px;">
</div>