a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,640 Commits 3 Branches 0 Tags 30 MiB
a14b825f1f
Commit Graph

2640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alireza Adli
a14b825f1f Remove etl from gitignore. Add the ER's building point to the module 2023-08-25 14:47:12 -04:00
Mike Simpson
0cc0ed385f
Merge pull request #1227 from colouring-cities/interface/ui-tweaks 
Interface/UI tweaks
 2023-08-16 14:52:20 +01:00
Mike Simpson
2ed41b1f9d Fix for switching layers via Layer Options menu 2023-08-16 14:49:30 +01:00
Mike Simpson
86eb45477a Fix for Historical Map Button logic 
Remember to correctly turn both layers off when switching back to Age data
 2023-08-16 14:15:18 +01:00
Mike Simpson
95d0fbd113
Merge pull request #1225 from colouring-cities/interface/ui-tweaks 
Interface/UI tweaks
 2023-08-16 12:29:05 +01:00
Mike Simpson
2ff4c472f0 Various Updates 
- Show Architectural Style in Typology, but can't edit it. Fixed link to Age & History. Removed Button and removed from Key.
- Added separate layers for Historical Map, with and without footprints.
-  Changed "Post War" to start in 1946.
 2023-08-16 12:24:28 +01:00
Mike Simpson
a6daaa5ab8
Update setup-dev-environment.md 2023-08-15 16:02:43 +01:00
Mike Simpson
fd11836bc8
Merge pull request #1224 from colouring-cities/fix/etl-test-polygons-1223 
Update get_test_polygons.py for osmnx 1.6.0
 2023-08-15 15:14:21 +01:00
Tom Russell
af54a67051 Fix lints 2023-08-15 14:10:19 +01:00
Tom Russell
5378fac326 Bump python for CI, install psycopg2 from wheel 2023-08-15 14:10:08 +01:00
Mike Simpson
d289650afe
Update etl.yml 
Update Python version to 3.8 to solve issue with osnmx (see #1223)
 2023-08-15 12:58:14 +01:00
Tom Russell
e2b26f09f3 Bump osmnx, relax fiona/shapely requirements 2023-08-15 12:44:30 +01:00
Tom Russell
7a72846659 Fix whitespace 2023-08-15 12:42:38 +01:00
Tom Russell
df65152198
Update get_test_polygons.py for osmnx 1.6.0 
TODO - update `etl/requirements.txt` to reflect osmnx==1.6.0
 2023-08-15 12:34:12 +01:00
Mike Simpson
c5b7f80e91 Tweaks 2023-08-10 14:20:51 +01:00
Mike Simpson
3e84e6f960 Change line colour/thickness on Survival Map 
- Blue lines instead of red
- Get thinner as you zoom out
- Disappear above a certain zoom level
 2023-08-10 14:14:32 +01:00
Mike Simpson
089e2af666 Move Architectural style data 
- Now in Age/History
- Tweaks to text, fix typos, dates, text layout
- Also fix "click here to show historical maps" button on Age & History page
 2023-08-09 14:47:41 +01:00
Mike Simpson
4e32ad9067 Tweaks to Dates and how Period is displayed 2023-08-09 14:08:39 +01:00
Mike Simpson
602449cf58 Add Original Land Use (Order) to Key 
Copied code from Current Land Use (Land Use Category) to automatically calculate the Land Use Order for Original Land Use and then visualise it on the map. #1219
 2023-08-03 16:42:12 +01:00
Mike Simpson
0db7ceb4e9 Move Attachment Form Options to be consistent with the rest of the code 2023-08-03 15:12:12 +01:00
Mike Simpson
6d13ab8048
Merge pull request #1222 from colouring-cities/interface/ui-tweaks 
Interface/UI tweaks
 2023-08-02 16:10:33 +01:00
Mike Simpson
7ec20446cf Add 'other' to dropdowns 
Last task on issue #1221
 2023-08-02 16:07:11 +01:00
Mike Simpson
178ba3d4b5 Changes to Style/period category, key and colours 2023-08-02 16:04:01 +01:00
Mike Simpson
5c0970a85e Copy/paste text fix 2023-08-02 15:54:14 +01:00
Mike Simpson
27fd9dccd6
Merge pull request #1220 from colouring-cities/interface/construction-updates 
Interface/construction updates
 2023-08-02 15:51:38 +01:00
Mike Simpson
c5b00ed428 Changes to interface text 2023-07-27 16:20:44 +01:00
Mike Simpson
d10d2c12b7 Add source types for Core Material 2023-07-27 16:15:38 +01:00
Mike Simpson
b326551d30 Add fields to Materials section 2023-07-27 15:48:01 +01:00
Mike Simpson
3d6113fb0d Decorative Features (and other tweaks) 
- Add Decorative Features sub category + data
- Add Source data to existing roof covering
- Move existing roof covering options to the correct place
- Add missed hints with links to GEM taxonomy
- Add fields to Database
 2023-07-27 15:16:50 +01:00
Mike Simpson
39a0a01d57 Add Structural System Subcategory 2023-07-27 14:25:50 +01:00
Mike Simpson
16c5a0a517
Merge pull request #1218 from colouring-cities/interface/ui-tweaks 
Changes to Colour Palettes
 2023-07-27 12:26:34 +01:00
Mike Simpson
25bd2633e8 Changes to Colour Palettes 2023-07-27 12:22:50 +01:00
Mike Simpson
1cbc23b23e
Merge pull request #1217 from colouring-cities/revert-1216-interface-tweaks 
Revert "Add News and Discussions Links"
 2023-07-27 11:40:28 +01:00
Mike Simpson
0169ca44a8
Revert "Add News and Discussions Links" 2023-07-27 11:38:37 +01:00
Mike Simpson
199bbb1d29
Merge pull request #1216 from colouring-cities/interface-tweaks 
Add News and Discussions Links
 2023-07-27 11:37:21 +01:00
Mike Simpson
5b11fc6c47 Add News and Discussions Links 
- Restore the link to the Colouring London discussions page (in addition to the GitHub link) #28
- Add a link to the new News page #29
 2023-07-27 11:35:40 +01:00
Mike Simpson
868c7fc029
Merge pull request #1209 from colouring-cities/dependabot/npm_and_yarn/app/word-wrap-1.2.4 
Bump word-wrap from 1.2.3 to 1.2.4 in /app
 2023-07-27 11:18:34 +01:00
Mike Simpson
9fa6a0abef
Merge pull request #1215 from colouring-cities/interface/ui-tweaks 
Change who's involved link
 2023-07-27 11:01:01 +01:00
Mike Simpson
d931146f84
Update README.md 2023-07-27 10:29:49 +01:00
Mike Simpson
8931f4fc53 Change who's involved link 2023-07-26 17:12:31 +01:00
Mike Simpson
04843057b6 Add "Other" to Common Source Types 2023-07-26 17:08:39 +01:00
Mike Simpson
b03da44d6b Specify that link points to the GitHub Discussions 
Link to old Discussion Forum needs to be added on Colouring London, not on Core.
#1213
 2023-07-26 17:07:29 +01:00
Mike Simpson
fd698062ea
Merge pull request #1214 from colouring-cities/interface/typology-updates 
Interface/typology updates
 2023-07-26 16:59:50 +01:00
Mike Simpson
ff4299e677 Changes to Dynamic Classification 2023-07-26 15:43:49 +01:00
Mike Simpson
348971257f Brighter colours 
Concerned that the darker colours were not bright enough to stand out against the black background
 2023-07-26 15:39:13 +01:00
Mike Simpson
30300a76cb Changed in the wrong file! 2023-07-26 15:36:01 +01:00
Mike Simpson
81072ff1c9 Land Uses in Alphabetical Order 
Temporary partial fix for #1194
 2023-07-26 15:31:45 +01:00
Mike Simpson
06de97145e Revert changes to Basic Typology Classification 
Key to be different from dropdown text
 2023-07-26 15:30:56 +01:00
Mike Simpson
75fe7dda4c Remove 'under development' text 2023-07-26 14:41:34 +01:00
Mike Simpson
5018a8e9ef Changes to Basic Typology Classification 
#1212
 2023-07-26 14:05:04 +01:00