Ed Chalstrey
a378f61a53
try swapping current_landuse_group for date_year hack
2022-05-23 11:14:27 +01:00
Ed Chalstrey
b5804c1f1c
Revert "attempt ignoring error"
...
This reverts commit fb319cd2f1
2022-05-23 10:45:52 +01:00
Ed Chalstrey
fb319cd2f1
attempt ignoring error
2022-05-23 10:36:37 +01:00
Ed Chalstrey
f4ca5ccd62
restore original "edits" dict
2022-05-23 10:17:34 +01:00
Ed Chalstrey
6d38ce7d3f
try setting state to buildingEdits: {}
2022-05-23 09:59:15 +01:00
Ed Chalstrey
97219998b9
try setting state to reload
2022-05-23 09:43:25 +01:00
Ed Chalstrey
2801782151
restore original "edits" dict
2022-05-20 11:42:14 +01:00
Ed Chalstrey
bb9d1468cc
refactor const edits
2022-05-19 16:54:24 +01:00
Ed Chalstrey
b512c58f90
fix bool
2022-05-19 16:35:52 +01:00
Ed Chalstrey
48673e3dbd
special handleVerify for current_landuse_group verification
2022-05-19 16:33:50 +01:00
Ed Chalstrey
39e7ac8b39
Revert "change slug value to null"
...
This reverts commit 999c42dcd3
2022-05-19 16:26:06 +01:00
Ed Chalstrey
999c42dcd3
change slug value to null
2022-05-19 16:24:39 +01:00
Ed Chalstrey
3b3fc12e93
update all calls to onVerify
2022-05-19 16:05:55 +01:00
Ed Chalstrey
ccc8bae992
finish prev commit
2022-05-19 15:52:46 +01:00
Ed Chalstrey
5c3d5a3741
add null value as default to onVerify
2022-05-19 15:49:05 +01:00
Ed Chalstrey
62421d60d3
update VerificationProps
2022-05-19 15:43:45 +01:00
Ed Chalstrey
b8d9c12a1b
handleVerify does same as handleSaveChange
2022-05-19 15:38:32 +01:00
Ed Chalstrey
d809f22573
doSubmit on handleVerify
2022-05-19 14:13:12 +01:00
Ed Chalstrey
f67c2b4149
add console log
2022-05-19 13:38:08 +01:00
Ed Chalstrey
df9766aebb
verify community_public_ownership_sources
2022-05-19 13:14:08 +01:00
Ed Chalstrey
18bcb68965
import verification construction
2022-05-19 13:06:15 +01:00
Ed Chalstrey
3ba9d0b5ef
add verification buttons construction
2022-05-19 13:04:53 +01:00
Ed Chalstrey
7ac1ab66a8
add more verification buttons
2022-05-19 12:58:54 +01:00
Ed Chalstrey
c7ff672e3b
add verify button ref_osm_id
2022-05-19 12:56:31 +01:00
Ed Chalstrey
9febf6a21e
add veriification current_landuse_link
2022-05-19 11:37:06 +01:00
Ed Chalstrey
4c0a5d0475
add verification to other side of if statement
2022-05-19 11:34:56 +01:00
Ed Chalstrey
fee86c1ee3
fix verify button current_landuse_source
2022-05-19 11:32:31 +01:00
Ed Chalstrey
bf8800930d
verify current_landuse_source
2022-05-19 11:18:17 +01:00
Ed Chalstrey
71b09c72f2
finish prev commit
2022-05-19 11:01:26 +01:00
Ed Chalstrey
dafd6d0468
add separated buttons to Age
2022-05-19 11:00:22 +01:00
Ed Chalstrey
2b7fd00d64
fix v buttons again - separate them
2022-05-19 10:58:09 +01:00
Ed Chalstrey
59dfaa7802
fix veriification buttons
2022-05-19 10:53:57 +01:00
Ed Chalstrey
0540d2514a
use props.allow_verify
2022-05-19 10:51:20 +01:00
Ed Chalstrey
3b5ca75eef
refactor date verification buttons
2022-05-19 10:48:53 +01:00
Ed Chalstrey
66c08a0da2
allow verify dates
2022-05-19 10:44:48 +01:00
Ed Chalstrey
07aeaf5cbd
Revert "fix"
...
This reverts commit 66ecd2b619
2022-05-19 10:40:12 +01:00
Ed Chalstrey
66ecd2b619
fix
2022-05-19 10:39:11 +01:00
Ed Chalstrey
485190842f
refactor dates verification
2022-05-19 10:35:13 +01:00
Ed Chalstrey
252d7ba214
remove commented
2022-05-19 10:31:48 +01:00
Ed Chalstrey
ba2b4b52ae
verfication for each year box
2022-05-19 10:28:51 +01:00
Ed Chalstrey
fec9134d1d
add verification date_year
2022-05-19 10:20:18 +01:00
Ed Chalstrey
a6bd0917fb
verify date source
2022-05-19 09:55:58 +01:00
Ed Chalstrey
00f3c40ded
add verification date_source
2022-05-13 15:24:13 +01:00
Ed Chalstrey
e05dd03b23
remive duplicate
2022-05-12 16:41:20 +01:00
Ed Chalstrey
8e21bf2982
update placeholder to use example for current use
2022-05-12 16:37:15 +01:00
Ed Chalstrey
fc16d10e8e
fix placeholder age
2022-05-12 16:36:14 +01:00
Ed Chalstrey
8bfcf2349d
Revert "revert pointless placeholder changes"
...
This reverts commit 694335cf3b
2022-05-12 16:34:16 +01:00
Ed Chalstrey
b46f637911
set up current_landuse_source like date_source
2022-05-12 16:30:55 +01:00
Ed Chalstrey
694335cf3b
revert pointless placeholder changes
2022-05-12 16:19:03 +01:00
Ed Chalstrey
dbf747d366
turn off link box whe null
2022-05-12 16:17:57 +01:00
Ed Chalstrey
a312a8c0b7
switch N/A for blank
2022-05-12 16:13:29 +01:00
Ed Chalstrey
121437d5cc
make link not appear for N/A
2022-05-12 16:13:06 +01:00
Ed Chalstrey
43c34b8ad9
make default dataFields.date_source.example "N/A"
2022-05-12 16:09:17 +01:00
Ed Chalstrey
8bc77b38b3
fix if statement
2022-05-12 15:57:46 +01:00
Ed Chalstrey
6f6e8e098a
fix duplicate attributes same name
2022-05-12 15:56:31 +01:00
Ed Chalstrey
70c537c078
pre-populate with example
2022-05-12 15:53:15 +01:00
Ed Chalstrey
a82918d7a1
Merge branch 'source-details-edits-2' into source-details-edits-3
2022-05-12 15:48:19 +01:00
Ed Chalstrey
394266cf2c
get deafult value for date_source
2022-05-12 15:17:00 +01:00
Ed Chalstrey
e0f11299c6
remove comment
2022-05-05 16:40:08 +01:00
Ed Chalstrey
0ae4602c89
rename
2022-05-05 16:37:41 +01:00
Ed Chalstrey
251a01e4f3
remove current_landuse_source_detail text box not needed
2022-05-05 16:33:57 +01:00
Ed Chalstrey
adb4bfa904
update current_landuse_group before return in removeBuildingUserVerifiedAttribute
2022-05-05 15:29:48 +01:00
Ed Chalstrey
e923c249db
update legend
2022-05-05 15:08:38 +01:00
Ed Chalstrey
66085bf67e
remove rogue quote
2022-05-05 14:11:17 +01:00
Ed Chalstrey
c8ab93ab9f
add current_landuse_verified to dataDefinition
2022-05-05 13:56:00 +01:00
Ed Chalstrey
7a0228bed1
un-verify in buildings table too
2022-05-05 13:23:49 +01:00
Ed Chalstrey
63c190c981
set buildings table to current_landuse_group = True when verify clicked
2022-05-05 13:22:05 +01:00
Ed Chalstrey
2025a286ed
update polygon colour for current use verified
2022-05-05 11:59:36 +01:00
Ed Chalstrey
5d5f4c71df
update dataFields with new current use fields
2022-04-29 14:34:11 +01:00
Ed Chalstrey
be0c149133
fix titles
2022-04-29 11:53:34 +01:00
Ed Chalstrey
db4870208c
update slugs
2022-04-29 11:52:11 +01:00
Ed Chalstrey
d0f9817d1e
fix tooltips
2022-04-29 11:49:46 +01:00
Ed Chalstrey
6fd0a313db
change current_landuse_source source options
2022-04-29 11:34:32 +01:00
Ed Chalstrey
0c0b994985
fix props values
2022-04-29 11:24:54 +01:00
Ed Chalstrey
9aff1efb0a
fix props values
2022-04-29 11:19:08 +01:00
Ed Chalstrey
fd2d0f0800
change props values
2022-04-29 11:13:29 +01:00
Ed Chalstrey
2aa89856d1
correct import statements
2022-04-29 11:09:25 +01:00
Ed Chalstrey
146759b341
add current_landuse_source data field
2022-04-29 11:00:56 +01:00
Ed Chalstrey
2476cc2c1e
copy source fields from age to current use and update slugs
2022-04-29 10:57:37 +01:00
Ed Chalstrey
0220547d53
modify buildings query to ignore demolished
2022-04-22 13:54:21 +01:00
Ed Chalstrey
d73a526835
refactor query to 3 way join
2022-04-21 16:48:35 +01:00
Ed Chalstrey
ac82c33bcb
refactor attempt
2022-04-21 16:29:34 +01:00
Ed Chalstrey
121f1ae13f
only modify query when table is buildings
2022-04-21 16:22:25 +01:00
Ed Chalstrey
322df6df53
more generic way to not display demolished buildings
2022-04-21 16:12:45 +01:00
Ed Chalstrey
6bfbff7a58
un-demolished buildings only
2022-04-21 15:24:46 +01:00
Tom Russell
98ce36b287
Add direct link to "blog" category in forum
2022-03-28 14:23:06 +01:00
Mateusz Konieczny
8c56d20638
Merge pull request #791 from colouring-cities/feature/generify-number-range
...
move number range to data components
2022-03-12 12:48:03 +01:00
Ed Chalstrey
e100dd5c7d
Merge pull request #776 from colouring-cities/docs-vagrant
...
Fully document setup of a working CL development environment
2022-03-01 10:21:43 +00:00
Mateusz Konieczny
6a386ed465
Final resolve of duplication
...
that is why PR reviews are nice
2022-02-23 09:51:01 +01:00
Mateusz Konieczny
4aa9df1427
move number range to data components
2022-02-23 09:25:23 +01:00
Mateusz Konieczny
594cae1e0b
Hide now duplicated question
2022-02-23 00:57:12 +01:00
Mateusz Konieczny
e3a6a3e40a
prevent some self-contradictions
2022-02-23 00:44:42 +01:00
Mateusz Konieczny
abc3ea3cc5
Ask about community activities in building
...
fixes #774
2022-02-23 00:22:22 +01:00
Mateusz Konieczny
3274ecd024
Merge pull request #783 from colouring-cities/feature/better-label
...
Replace State-owned by Government-owned
2022-02-22 20:38:58 +01:00
Mateusz Konieczny
22501850be
Tweak colour of garden buildings
...
https://github.com/colouring-cities/colouring-london/pull/782#issuecomment-1047876471
2022-02-22 20:27:43 +01:00
Mateusz Konieczny
273936de06
Merge pull request #782 from colouring-cities/feature/special-colors-for-special-residential
...
Special colors for hotels/garden buildings
2022-02-22 13:40:52 +01:00
Mateusz Konieczny
07165361b3
List earlier date earlier than upper date
2022-02-17 10:50:31 +01:00
Mateusz Konieczny
d7def11d4f
Replace State-owned by Government-owned
...
part of #734
2022-02-16 16:08:29 +01:00
Mateusz Konieczny
05bb5f36ae
New message in Team view
2022-02-16 14:46:54 +01:00
Mateusz Konieczny
3b25d7f36e
Special colors for hotels/garden buildings
...
part of #724
2022-02-15 19:57:25 +01:00
Mateusz Konieczny
bba80f4511
Allow multiline legend entries
...
text will pleasantly flow on right side rather than appearing under icon
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
fe94a51da4
Modify already commited migration
...
this avoids confusing migration in repository that could damage data, as meaning of the data in database mismatched decription
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
a08da58ad3
Undo accidental bump of mapnik version
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
9ba7e04f91
Improve name of unclassified
2022-02-14 13:36:19 +01:00
Tom Russell
4e40b31bac
Fix for compilation error
...
ERROR in src/frontend/route.tsx:36:25
TS2339: Property 'from' does not exist on type '{}'.
2022-02-02 15:06:57 +00:00
Tom Russell
593e3a1f26
Possibly-working npm module state
2022-02-02 15:06:16 +00:00
Mateusz Konieczny
598ab0fa2a
Refine secondary construction materials title
...
requested in #727
2022-02-02 11:31:53 +01:00
Mateusz Konieczny
867c6312b0
Rename construction system
...
requested in #727
2022-02-02 11:26:06 +01:00
Mateusz Konieczny
ae39bc8066
Flip colors of wood and other natural material
...
requested in #727
2022-02-02 11:24:23 +01:00
Mateusz Konieczny
09b9a4f2ce
Merge pull request #771 from colouring-cities/feature/reword-local-asset
...
Feature/reword local asset
2022-02-01 17:06:12 +01:00
Mateusz Konieczny
19f358b890
Merge pull request #769 from colouring-cities/feature/hide-likes
...
hide likes
2022-02-01 17:05:18 +01:00
Mateusz Konieczny
fdd600467b
Change community_activities title
...
requested in #734
2022-02-01 12:47:16 +01:00
Mateusz Konieczny
aae71d76af
Better describe section in Community
...
better describe section about community use
2022-02-01 12:43:28 +01:00
Mateusz Konieczny
032e02ebd2
Modify phrasing for locally significant building
...
third part of #734
2022-02-01 12:38:50 +01:00
Mateusz Konieczny
482678b44f
Eliminate dead code
2022-02-01 12:33:11 +01:00
Mateusz Konieczny
db64f40708
Restore labels in the history menu
2022-01-31 17:59:10 +01:00
Mateusz Konieczny
ee16977b66
Hide prominent display of likes counts
...
it remains accessible from map (approximate values) and from history tag of given object
removal is motivated by desire to avoid misleading "0 people likes this building" - true about database state but not true about world in general
exact phrasing is also a bit problematic in general
2022-01-31 17:56:28 +01:00
Mateusz Konieczny
e8ff5df818
Merge pull request #711 from colouring-cities/feature/new-building-types
...
Feature/new building types
2022-01-18 18:35:12 +01:00
Mateusz Konieczny
c30c3b6e1c
Finish rename
2022-01-18 10:33:58 +01:00
Mateusz Konieczny
08807b2654
Enable hiding legend also on a large screens
2022-01-14 06:11:28 +01:00
Mateusz Konieczny
e12b544503
Merge pull request #708 from colouring-london/feature/more-confetti
...
Adding more confetti, as requested
2022-01-13 15:47:20 +01:00
Mateusz Konieczny
1bf1edd2ae
Add ability to mark buildings as unknown
...
Also, make residential a bit stronger.
2022-01-11 17:51:07 +01:00
Mateusz Konieczny
e2c9fd4073
Adding more confetti, as requested
2022-01-10 14:21:03 +01:00
Mateusz Konieczny
12290c09b6
Merge pull request #700 from colouring-london/feature/new_lockfile
...
Update lockfile version to 2
2021-12-12 18:29:04 +01:00
Mateusz Konieczny
5ed0b261ae
Set night mode as a default
2021-12-09 17:39:00 +01:00
Mateusz Konieczny
7fea5abc7f
Update lockfile version to 2
...
See https://github.blog/2021-02-02-npm-7-is-now-generally-available/#changes-to-the-lockfile
This was triggered by updating caniuse
Which was in turn caused by following
> Run npx browserslist@latest --update-db
request appearing during build
2021-12-09 01:33:16 +01:00
Mateusz Konieczny
a0111a190b
Simplify code
...
Co-authored-by: Tom Russell <tomalrussell@gmail.com>
2021-12-08 17:54:09 +01:00
Mateusz Konieczny
9bae9a0b63
Merge branch 'master' into night_mode
2021-12-03 20:37:03 +01:00
Mateusz Konieczny
6551d9742f
revert part of whitespace changes
2021-12-03 20:32:54 +01:00
Mateusz Konieczny
92d0899a95
Merge pull request #694 from colouring-london/feature/689-privacy-policy-and-contributor-agreement
...
Feature - privacy policy and contributor agreement (#689 )
2021-11-08 18:21:40 +01:00
Mateusz Konieczny
b8504c7ea5
Apply provided text of contributor agreement
...
some fixes were applied to the provided text, see https://github.com/colouring-london/colouring-london/issues/689#issuecomment-962927441
2021-11-08 09:49:31 +01:00
Mateusz Konieczny
3f169e4bf4
Apply provided privacy policy text
2021-11-08 09:49:29 +01:00
Mateusz Konieczny
2e43ee2118
Fix some typos
2021-11-08 09:48:24 +01:00
Mateusz Konieczny
e110a07a83
apply new code of conduct text
2021-11-06 06:13:50 +01:00
Mateusz Konieczny
fa3261cdfb
apply provided data accuracy text
2021-11-05 18:31:14 +01:00
Maciej Ziarkowski
25a4bb7e0d
Add new feature notice, solid border in community
2021-10-11 14:13:02 +02:00
Maciej Ziarkowski
ad8b4343d3
Add markdown support, add bold to community title
2021-10-11 11:49:04 +02:00
Maciej Ziarkowski
22cac99675
Change public ownership sources field to array
2021-10-08 13:19:48 +01:00
Maciej Ziarkowski
a4d1afab81
Rewrite map with hooks, add map colour toggle
...
Map and Legend components rewritten using hooks.
Also, each category can now have multiple available colour scales.
These can be switched using a select dropdown in the legend.
2021-10-01 13:30:03 +01:00
Maciej Ziarkowski
d3a17f2e5f
Tweak style and text of user opinion aggregations
2021-09-30 15:51:20 +01:00
Maciej Ziarkowski
d438dc2189
Revert type change for user_verified in frontend
...
In principle the type annotation is desirable,
but something causes errors in YearDataEntry.
Need to work this out at a different time
2021-09-27 14:07:54 +03:00
Maciej Ziarkowski
75f0044b3b
Add community fields about public ownership
2021-09-27 13:47:27 +03:00
Maciej Ziarkowski
522eff2031
Correct API error on unknown field edit
2021-09-24 20:32:05 +03:00
Maciej Ziarkowski
8c8a6a8094
Add user opinion fields to community section
2021-09-24 20:31:03 +03:00
Maciej Ziarkowski
29ed25f36c
Replace likes with generic building-user attribs
2021-08-23 02:26:58 +01:00
Maciej Ziarkowski
c1679a0c35
Handle likes database count as integer
2021-08-12 21:11:52 +01:00
Maciej Ziarkowski
2118d6ba7c
Add likes_total data definition in API
2021-08-12 21:11:36 +01:00
Maciej Ziarkowski
a0da41fa92
Reformat like data entry
2021-08-12 21:11:00 +01:00
Maciej Ziarkowski
806e1f6e74
Merge pull request #684 from mz8i/fix/681-land-use-edit
...
Allow non-editable fields to be auto-derived
2021-08-12 01:32:06 +01:00
Maciej Ziarkowski
9722c173d8
Allow non-editable fields to be auto-derived
...
Some fields shouldn't be editable through the API
but can still be modified, because they are derived
from another field which is editable.
This change fixes a bug where a derived field
wouldn't be updated, because it was not on the
editable fields whitelist.
2021-08-12 01:29:37 +01:00
