Commit Graph

1840 Commits

Author SHA1 Message Date
dependabot[bot]
52f06fe896
Bump minimist from 1.2.5 to 1.2.8 in /app
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-04 02:50:10 +00:00
dependabot[bot]
507a61faf3
Bump loader-utils from 1.4.0 to 1.4.2 in /app
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:56:00 +00:00
dependabot[bot]
30a16632ba
Bump qs, body-parser and express in /app
Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [body-parser](https://github.com/expressjs/body-parser) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.9.6 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.11.0)

Updates `body-parser` from 1.19.1 to 1.20.1
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.1...1.20.1)

Updates `express` from 4.17.2 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
- dependency-name: body-parser
  dependency-type: direct:production
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
e8ffd5ef3c
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
5e42236ee2
Bump json5 from 1.0.1 to 1.0.2 in /app
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:46 +00:00
Mike Simpson
2f21ef0020
Merge pull request #1098 from colouring-cities/tweaks/ui
Rename Size and Form Category
2023-02-24 09:45:33 +00:00
Mike Simpson
42578c0686 Rename Size and Form Category 2023-02-17 15:13:53 +00:00
Mateusz Konieczny
b19ada700b fix typo: maybe rented -> may be rented
fixes #1078
2023-02-17 10:21:48 +01:00
Mike Simpson
4c4cfdc145 Merge remote-tracking branch 'upstream/master' 2023-02-15 16:53:07 +00:00
Mateusz Konieczny
fa9e81d281 Button style unification for user-survey questions 2023-02-15 17:14:51 +01:00
Mike Simpson
fc2cc07a1c
Merge pull request #1089 from colouring-cities/colouring-core-fixes
Colouring core fixes
2023-02-15 15:55:32 +00:00
Mike Simpson
4a0e65f8c4
Merge pull request #1081 from matkoniecz/feature/core-18-domestic-likes
Rework likes and upgrades to community section, ask is building domestic, deduplicate landuse section
2023-02-15 09:14:02 +00:00
Mateusz Konieczny
d0cd948991 tweak labels as requested 2023-02-15 09:46:08 +01:00
Mateusz Konieczny
58e5e359a9 fix font colour of inline map buttons 2023-02-15 08:25:33 +01:00
Mateusz Konieczny
0f62cad9db buttons always have enabled/disabled state
fixes #1085
2023-02-15 08:25:06 +01:00
Mateusz Konieczny
741df74c7f local significance/interest labels 2023-02-15 07:44:35 +01:00
Mateusz Konieczny
7c8834947e tweak button text 2023-02-15 07:44:08 +01:00
Mateusz Konieczny
62fbd4378e drop dead code 2023-02-15 07:43:46 +01:00
Mike Simpson
2681b4b5e5
Merge pull request #1082 from matkoniecz/feature/allow-multiline-in-section-headers
make data entry group work with long titles
2023-02-14 14:04:30 +00:00
Mike Simpson
db76a30ec5 Update GitHub URLs 2023-02-14 13:23:35 +00:00
Mateusz Konieczny
f3bc1c9e58 unify labels
previously other had year, this had date despite asking for a year
2023-02-14 13:06:48 +01:00
Mateusz Konieczny
5edf6d4b1f remove no longer needed code 2023-02-09 22:56:37 +01:00
Mateusz Konieczny
7d9580ae17 new more descriptive map buttons 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
18023e786a remove switcher for a primary map style 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
86d60058e1 add horizontal lines splitting different sections 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
e4500ba025 change instruction as instructed 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
cd92cb7ed7 shorten header descriptions 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
04d09c1f39 tweak question as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8603940964 rearrange section structure in Community
no reintended for now to keep things nicely mergable/diffable
2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8894fc167c tweak the tile as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
c74d358c33 remove 'is domestic' question form community and hide liking individual buildings 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
aab44869f8 fix button code 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
fe87fa62e6 make data entry group work with long titles
may have some unexpected side-effects but testing has not revealed any
2023-02-09 22:49:47 +01:00
Mike Simpson
dd17436a53
Update cc-config.json 2023-02-09 11:24:27 +00:00
Mike Simpson
6bc16e5e2d Colouring London Config Settings 2023-02-09 11:23:35 +00:00
Mike Simpson
cd6cfb1130 Generify Config Data for new Colouring Core Branch 2023-02-09 10:47:17 +00:00
Mike Simpson
d63da083e0 Add Project-specific Privacy Policy Info to Config 2023-02-08 12:04:33 +00:00
Mike Simpson
47deb9b12a Correct GitHub URL 2023-02-08 10:58:24 +00:00
Mike Simpson
3c0157d0ea Merge branch 'master' into colouring-core 2023-02-08 10:54:04 +00:00
Mateusz Konieczny
fec74c4a84 prevent duplication in landuse code 2023-02-08 10:28:58 +01:00
Mateusz Konieczny
8f7eb6bf81 use more clear naming variant 2023-02-07 13:09:16 +01:00
Mateusz Konieczny
83847d75b9 fix typology likes detection 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
037eced6f1 fix whitespace 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
26a330f743 likes typology display 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
5431f8528e better buttons on the map in community section
enable map button for domestic status
show like button when relevant
2023-02-07 11:42:05 +01:00
Mateusz Konieczny
cee0c16edf add new map style for domestic status 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
df07a3bf1d add work from home explanation 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
e3e9e83632 allow mixed answer for domestic use 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
621a5b67db tweak questions and add new ones on what is worth keeping 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
4b4fe20281 use yes only interface for worth keeping ones 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
2356548aad rename question
per https://github.com/colouring-cities/colouring-core/issues/18#issuecomment-1413641393
2023-02-07 11:42:05 +01:00
Mateusz Konieczny
ae0e0bb2b6 Add question whether building is domestic. 2023-02-07 11:42:01 +01:00
Mateusz Konieczny
5bde854045 remove box about a new feature 2023-02-07 10:32:31 +01:00
Mike Simpson
7aebd77f10 Merge branch 'master' into colouring-core 2023-02-03 11:28:45 +00:00
Mike Simpson
6dd356bbeb
Merge pull request #1076 from matkoniecz/fix/1065-move-the
exclude the from the link
2023-02-03 10:59:26 +00:00
Mike Simpson
43b9c650a7 Additional Tweak
See #1074
2023-02-03 10:55:22 +00:00
Mateusz Konieczny
372873b97a exclude the from the link
apply https://github.com/colouring-cities/colouring-london/issues/1065#issuecomment-1413639850
2023-02-02 15:17:05 +01:00
Mike Simpson
a43c0593fe Various tweaks requested by Polly
Changes to subcategories, wording and typo fixes discussed in a meeting with Polly on 02/02. #1074
2023-02-02 13:02:05 +00:00
Mike Simpson
3c3ffc76b5
Merge pull request #1072 from matkoniecz/feature/1071-more-ca-info
Provide more instruction for user when editing CA and fix review button
2023-02-02 12:30:14 +00:00
Mike Simpson
994d9de0ac
Merge pull request #1070 from matkoniecz/fix/again
Group of changes based on feedback from meeting preparations
2023-02-02 12:29:22 +00:00
Mateusz Konieczny
1499534f9e provide requested disclaimer
fixes #1065
2023-02-02 13:10:02 +01:00
Mateusz Konieczny
24818a83ec More instruction about CA, fix the review button
fixes #1071
2023-02-02 08:08:41 +01:00
Mateusz Konieczny
b8349a391c be less optimistic 2023-01-24 12:00:08 +01:00
Mateusz Konieczny
cec81583ac new colouring for Withdrawn 2023-01-24 10:56:09 +01:00
Mateusz Konieczny
418b03ada1 new Withdrawn styling 2023-01-24 10:43:21 +01:00
Mateusz Konieczny
ad51f3433e new wording for active application info 2023-01-24 10:35:46 +01:00
Mateusz Konieczny
4a61f19103 Revert "unroll layer option on using buttons"
This reverts commit 5a59815234.
2023-01-24 10:35:41 +01:00
Mateusz Konieczny
5a59815234 unroll layer option on using buttons 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
e7d3bdc784 mention where more specific sources are 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
63e22f46b6 add one more link to datahub 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
9868a700f8 rewrite explanation info for current applications 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
8c9f62b51e mention CA short name 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
f262aedb89 better coloring for formerly pink buttons
fixes #1064
2023-01-23 14:44:37 +01:00
Mike Simpson
9c1e22663e
Merge pull request #1066 from matkoniecz/fix/assorted-fixes
assorted fixes
2023-01-23 11:21:59 +00:00
Mateusz Konieczny
3f34999543 handholding in more readable form 2023-01-23 10:48:20 +01:00
Mateusz Konieczny
0e55e4d668 more handholding for new users
see https://github.com/colouring-cities/colouring-core/issues/11
2023-01-23 10:44:13 +01:00
Mateusz Konieczny
b425eec23c add note as requested in https://github.com/colouring-cities/colouring-london/issues/1049 2023-01-23 07:12:03 +01:00
Mateusz Konieczny
5dc71a4194 fix last year map display
fixes https://github.com/colouring-cities/colouring-core/issues/12
2023-01-23 06:49:45 +01:00
Mateusz Konieczny
dc82fef4ab more accurate description 2023-01-23 06:49:45 +01:00
Mateusz Konieczny
a022aa6f4d change DataHub to Datahub 2023-01-23 06:49:45 +01:00
Mateusz Konieczny
159acb249b more aggressive caching
in tests it seems confirmed that caching noticeably improves performance (Polly noticed that age layer is noticeably faster without being aware that it is cached more aggressively, in testing in general all layers benefit from caching even at zoom level 18 for relatively minor storage cost and differences in the first use performance that are basically not possible to measure (or at least I failed to measure them)

caching will be especially important as more people will use the site and will help reduce server costs

see also #1062 proposing further simplification of this code
2023-01-20 21:48:18 +01:00
Mateusz Konieczny
24f757e79b add option to switch back to planning applications map 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
17688e9e38 new interface for layer handling
closes #1059
2023-01-19 14:41:23 +01:00
Mateusz Konieczny
233041581e add manual link, simplify code link in sidebar 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
62b4879d63 drop dead code 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
ed58e413e0 fix switching of historic building layer
empty map is gone (again)
2023-01-19 14:41:23 +01:00
Mateusz Konieczny
d75a3d3ee7 remove button for getting back to empty map style as it is gone 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
f8ebd89e82 fix typo 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
d73e7271dc experimentally remove retina support 2023-01-19 14:41:23 +01:00
Mateusz Konieczny
5fdd586820 remove 'coming soon' from showcase notes 2023-01-19 14:41:19 +01:00
Mateusz Konieczny
52805662a1 test whether retina matters
for #1053
2023-01-19 14:40:16 +01:00
Mateusz Konieczny
e6245aae50 Revert "Revert "remove empty map layer""
This reverts commit 86d437a609.

This fixes #1051
2023-01-19 14:40:16 +01:00
Mateusz Konieczny
4efaf8bd90 use colours for the button state
proof of concept for #1039 (tweaking clicked/hover colours may be needed)
2023-01-19 14:40:16 +01:00
Mateusz Konieczny
f397bf2065 change labels of button for overlays
fixes #1038
2023-01-19 14:40:16 +01:00
Mateusz Konieczny
8c6c337291 Open planning application link in a new window
fixes #1044
2023-01-19 14:40:16 +01:00
Mateusz Konieczny
be23cf2fb6 add missing thes, fixes #1045 2023-01-19 14:40:16 +01:00
Mike Simpson
3aa2bd5510 Link to Planning Section Discussions #1048 2023-01-17 11:37:07 +00:00
Mike Simpson
cd1184cefa Fixes #1042 2023-01-17 11:01:48 +00:00
Mike Simpson
ef09fa3b78 Merge branch 'master' into feature/new-categories-menu 2023-01-17 10:54:47 +00:00
Mike Simpson
023e708db5 Add pink button to lifespan section
As requested in #1050
2023-01-17 10:49:28 +00:00
Mike Simpson
ba869fe5c9
Merge pull request #1019 from matkoniecz/fix/consistent-message-themes
set message about planned layer to yellow
2023-01-13 14:51:54 +00:00
Mike Simpson
ec41e4f7a7
Merge pull request #1014 from matkoniecz/feature/rename-location-field
rename field in Location section
2023-01-13 14:30:13 +00:00
Mike Simpson
8db468c873
Merge pull request #1035 from matkoniecz/fix/1024-fix-login
proper check on login
2023-01-13 14:28:00 +00:00
Mike Simpson
f65353fa4b
Merge pull request #1041 from matkoniecz/feature/1036-add-reset-button
add button to reset overlay state
2023-01-13 14:25:46 +00:00
Mateusz Konieczny
9c07119e6d add button to reset overlay state 2023-01-10 21:42:18 +01:00
Mateusz Konieczny
55b1a46c57 proper check on login 2023-01-10 16:23:49 +01:00
Mateusz Konieczny
6e6852191a adjust flex to work better with long titles 2023-01-10 16:12:46 +01:00
Mike Simpson
7199c7f6a3
Merge pull request #1016 from matkoniecz/feature/remove-replaced-hint
this hint is replaced by hint in the sidebar
2023-01-10 14:52:09 +00:00
Mike Simpson
f2aa6b96fe
Merge pull request #1017 from matkoniecz/fix/typo
fix typo in performance optimization
2023-01-10 14:51:45 +00:00
Mike Simpson
07f58dab78
Merge pull request #1025 from matkoniecz/fix/make-postcode-search-less-annoying
just immediately go to the first match - postcode search
2023-01-10 14:50:47 +00:00
Mike Simpson
f495609f28
Merge pull request #1026 from matkoniecz/fix/1013-less-confusing-label
Make status title less confusing
2023-01-10 14:35:54 +00:00
Mike Simpson
a6e093daf8
Merge pull request #1028 from matkoniecz/feature/better-handling-of-labels
better margin handling for category buttons
2023-01-10 12:00:13 +00:00
Mike Simpson
00d9f862ac Colouring Core Issue 10 2023-01-10 11:53:10 +00:00
Mateusz Konieczny
e4bfa4ba41 reduce extra padding to avoid unexpected runaway boxes 2023-01-09 18:49:46 +01:00
Mateusz Konieczny
e89e79671c better place for extra padding 2023-01-09 18:37:36 +01:00
Mateusz Konieczny
b225c9e8ae label on top of lines 2023-01-09 17:32:21 +01:00
Mateusz Konieczny
14c2860d79 better margin handling for category buttons 2023-01-09 17:26:54 +01:00
Mike Simpson
21d38012f0 Fix Historical Maps not working on certain buildings 2023-01-09 15:26:29 +00:00
Mike Simpson
10872b8a45 Functionality for 'historical maps' button 2023-01-06 15:35:28 +00:00
Mike Simpson
b0707d47f0 Reorder and rename categories on the grid
As requested in https://github.com/colouring-cities/colouring-core/issues/1
2023-01-06 13:18:06 +00:00
Mateusz Konieczny
1bec59d269 Make status title less confusing
especially for historic data 'current' was confusing
also it is shorter and easier to read
fixes #1013
2023-01-06 12:33:29 +01:00
Mateusz Konieczny
7f48ffeb7c just immediately go to the first match
and do not show hard to dismiss dropdown
2023-01-06 11:36:23 +01:00
Mateusz Konieczny
60397aaefb set message about planned layer to yellow
for conistency with other similar boxes
2023-01-04 16:22:55 +01:00
Mateusz Konieczny
31b75fa041 fix typo in performance optimization 2023-01-04 13:10:45 +01:00
Mateusz Konieczny
38947b6cd8 remove no longer needed hint
replaced by notice in the sidebar
2023-01-04 13:04:58 +01:00
Mateusz Konieczny
05b28ed237 rename field in Location section 2023-01-03 17:41:44 +01:00
Mateusz Konieczny
f968172f9d larger labels for administartive areas 2023-01-03 17:39:54 +01:00
Mateusz Konieczny
18fd538609 new color for submitted planning applications 2022-12-22 16:32:38 +01:00
Mateusz Konieczny
80714255b1 smarter enabling/disabling map buttons 2022-12-22 16:32:16 +01:00
Mateusz Konieczny
86d437a609 Revert "remove empty map layer"
This reverts commit 32752fe71e.
2022-12-22 15:12:09 +01:00
Mateusz Konieczny
a2248b99d9 increase width of inline switcher buttons 2022-12-22 14:58:36 +01:00
Mateusz Konieczny
861164124c smarter display of 'only current/past data' case 2022-12-22 09:04:54 +01:00
Mateusz Konieczny
3172a394d9 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-12-21 18:52:38 +01:00
Mateusz Konieczny
3fc2bd9225 fix dropdown
solved by GPTchat
2022-12-21 18:49:05 +01:00
Mateusz Konieczny
a16983e40b Merge branch 'master' into feature/display-of-planning-data 2022-12-21 18:36:42 +01:00
Mike Simpson
5fc0b66bb3 Merge branch 'master' into colouring-core 2022-12-20 10:50:57 +00:00
Mike Simpson
55c3833928 Add Categories grid to Welcome page 2022-12-20 10:40:22 +00:00
Mateusz Konieczny
e097a94075 fix attribution 2022-12-18 19:49:59 +01:00
Mateusz Konieczny
08c3da8f0c new fill style for labels 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
23dad86f7f style borough labels across all zoom levels 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
fbc4b7d858 segregate inactive groups into the end section 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
2a4911c2f2 more advanced styling 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
9cc0c48c3f smarter performance on editing by excluding some unchanged layers 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
e6341d4628 try better scaling 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
12164620e9 cache more for base_night_outlines and base_boroughs 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
cbb31ad019 try historic map on all zoom levels 2022-12-18 19:49:58 +01:00
Mateusz Konieczny
c4933fdc11 proof of concept for borough names with Mapnik-based tiles 2022-12-18 19:49:47 +01:00
Mateusz Konieczny
838a0dd087 more transparent conservation areas overlay 2022-12-15 13:25:12 +01:00
Mateusz Konieczny
6ca1d0d473 extra button for Conservation area and text tweaks 2022-12-15 13:24:43 +01:00
Mateusz Konieczny
554da9344b add missing full stop 2022-12-15 12:34:58 +01:00
Mateusz Konieczny
f86ef86abd add enabling parcel overlay 2022-12-15 11:46:43 +01:00
Mateusz Konieczny
8a8465520c change some labels 2022-12-15 11:23:12 +01:00
Mateusz Konieczny
14c2ca92d8 tweak styling of conservation boundary 2022-12-14 12:14:49 +01:00
Mateusz Konieczny
14e16cce83 remove yes/no style questions where there is no yes/no answer 2022-12-14 11:52:29 +01:00
Mateusz Konieczny
79761ab67a change style of disabled section 2022-12-12 14:40:57 +01:00
Mateusz Konieczny
2b380c25b6 put conservation area behind buildings 2022-12-12 14:38:58 +01:00
Mateusz Konieczny
bd6bd7531e mark inativity in the title 2022-12-12 14:37:58 +01:00
Mateusz Konieczny
01a11a30a6 tweak descriptions 2022-12-12 13:53:44 +01:00
Mateusz Konieczny
adf6418e2c restore info for planning applications 2022-12-12 13:23:02 +01:00
Mateusz Konieczny
9c18d379e9 tweak guide in planning zones 2022-12-12 13:17:00 +01:00
Mateusz Konieczny
a6d2bc3bf4 swap colours so rare case will use problematic blue
There is a plan by Polly to review colours in geenral, but until this happens it is preferable to use problematic one for buildings likely to be rare
Blues are problematic as building selection is less visible and there are multiple blues close to each other
2022-12-12 13:04:56 +01:00
Mateusz Konieczny
89f1612ae6 future applications map button 2022-12-12 13:01:00 +01:00
Mateusz Konieczny
e59973e1cb switch blue to purple for submitted applications
blue, even dark one, was too similar to building selection marker
2022-12-12 12:57:17 +01:00
Mateusz Konieczny
3400eeb30c tweak labelling of buttons 2022-12-12 12:41:40 +01:00
Mateusz Konieczny
e32cc9b2b9 fix typo 2022-12-12 12:21:23 +01:00
Mateusz Konieczny
c2bb03d729 better phrasing 2022-12-12 12:20:41 +01:00
Mateusz Konieczny
c5c87b8731 remove not needed message 2022-12-12 12:20:26 +01:00
Mateusz Konieczny
dc77bc3722 add missing also 2022-12-12 12:09:59 +01:00
Mateusz Konieczny
f2c31bdcd6 use placeholder list 2022-12-12 12:05:05 +01:00
Mateusz Konieczny
65a7286b85 tweak placeholder display 2022-12-12 12:04:39 +01:00
Mateusz Konieczny
d0323dbee8 building protection - description tweaks 2022-12-12 11:55:31 +01:00
Mateusz Konieczny
9915440add buttons in the community section 2022-12-12 11:54:56 +01:00
Mateusz Konieczny
da0727b57d add switchToBuildingProtectionMapStyle 2022-12-09 14:29:25 +01:00
Mateusz Konieczny
501bf5401b enable first map switching button 2022-12-09 14:12:02 +01:00
Maciej Ziarkowski
f6c0d3fd4b Lift map colour scale context up into MapApp 2022-12-09 13:03:42 +01:00
Mateusz Konieczny
ed0f0c7d69 fix colour of instruction box 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
4a39626594 special colour for disclaimers 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
1953a8d5ae remove not needed <br/> 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
84c097fa9f disclaimer styling 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
61e2ebf460 tweak map button styling 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
3ac50e2549 fix night map style 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
778ff84f31 consolidate css files 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
97b4b810b6 drop dead code 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
ffb988bebb add keys to control map 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
3983475e2e tweak text 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
1e056b8825 fix colours of boxes 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
8436987091 increase minimum width for inline pink buttons
longer labels caused ugly effects with different sizes
2022-12-08 20:45:33 +01:00
Mateusz Konieczny
dcc277bee5 tweak descriptions again 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
420ec9a47e unify styling 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
a94c5da927 describe action on buttons 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
5562f07780 more descriptions of zones 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
befbe6265e unify map display state store
fix night mode display for buttons
2022-12-08 20:45:33 +01:00
Mateusz Konieczny
21eea660be simplify code 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
57361dcbdc remove dead code 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
7c66edd570 add tooltips explaining what is the meaning of this layers 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
56c051d0eb tweak description 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
679a302bbd provide more clear info what is going on 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
0fa112e732 drop not applicable css remmants 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
f181daa900 tweak labels of layer buttons 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
b17b7922b6 enable/disable layer buttons 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
6ad6c7f11b fix mistaken label 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
499ecbf982 replace styling with newlines by css 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
57504f21c3 provide hacky spacing 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
46a7ac6cf3 tweak layer naming 2022-12-08 20:45:33 +01:00
Mateusz Konieczny
e885d758dc add useContext to allow changing display state from two places
- buttons on the map
- sidebar buttons
2022-12-08 20:44:36 +01:00
Mateusz Konieczny
38c75ac1a3 fix phrasing on some overlay buttons 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
4218350b71 reorder switch buttons as expected 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
97f8d9cf93 tweak housing colour 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
e407919129 get housing zones data in geojson
that was a silly story
https://apps.london.gov.uk/planning/?_gl=1*avicz4*_ga*MTg1MjY3MzMuMTY2NzcxMjIwMg..*_ga_PY4SWZN1RJ*MTY2NzcxMjI1NS4xLjAuMTY2NzcxMjI1NS42MC4wLjA links datastore
https://data.london.gov.uk/dataset/housing_zones is there
but for some reason it can be opened and viewed in QGIS that fails to export it
this failed with errors that once solved resulted in more problems

in the end I got data from initial site, captured network traffic with Firebug, manuall converted from some esri format into badly-handed Geojson
then rewound with https://github.com/mapbox/geojson-rewind

it is possibly that there was data loss or other issues along the way but at least data is there
2022-12-08 20:42:56 +01:00
Mateusz Konieczny
eff41d5c22 drop weird name 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
9431b4256e consistent naming 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
1d2a4430f7 enable buttons 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
9eb1ccff22 enable three more layers 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
b34e8c6ed3 housing zones with massive problem 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
372b6a9187 record protected vistas geometries
https://data.london.gov.uk/dataset/london-views-management-framework-lvmf-extended-background-vistas

CC-BY-SA 4.0 by Greater London Authority (GLA)
2022-12-08 20:42:56 +01:00
Mateusz Konieczny
9e2bfe1438 add creative entrprise zone geomtries
that was a bit tricky - captured in requests made by https://apps.london.gov.uk/planning/?_gl=1*avicz4*_ga*MTg1MjY3MzMuMTY2NzcxMjIwMg..*_ga_PY4SWZN1RJ*MTY2NzcxMjI1NS4xLjAuMTY2NzcxMjI1NS42MC4wLjA

licence:ogl-v3 The boundaries are based on Ordnance Survey mapping and the data is published under Ordnance Survey's 'presumption to publish'.Contains OS data © Crown copyright and database rights 2019.
2022-12-08 20:42:56 +01:00
Mateusz Konieczny
241c0583a9 enable borough boundary display by default 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
c0b58acc3a add or improve attributions 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
03bdf47cc5 show outlines for historic map across all zoom levels 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
60253d2a79 better description of historic map 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
7b85b68490 subtler stroke for outlines 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
19770cd343 add outline for historic map on top of it 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
8f1a03222c new historic map example 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
374a34e4ad conservation boundary new style 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
a93aabfc4a historic map display test
note that it is test only - terms of use and copyright status needs to be checked
2022-12-08 20:42:56 +01:00
Mateusz Konieczny
8843cf33ef brown ca styling in overlays 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
f3aaeddb96 more visible conservation area layer 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
9805c0c17b switch conservation area to purple 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
c070e6a946 enable conservation area display 2022-12-08 20:42:56 +01:00
Mateusz Konieczny
43e275dea7 add conservation areas from http://www.bedfordpark.net/leo/planning/
The dataset is made available under a Creative Commons Attribution 4.0 licence, but contains public sector information licensed under the Open Government Licence v.3.0
2022-12-08 20:42:55 +01:00
Mateusz Konieczny
b6d4037226 show flood areas as areas 2022-12-08 20:42:55 +01:00
Mateusz Konieczny
669ec659fa add flood zone display 2022-12-08 20:42:55 +01:00
Mateusz Konieczny
00b975b251 switch righ-hand rule 2022-12-08 20:42:55 +01:00
Mateusz Konieczny
5a03149ddd add flood zone geometry 2022-12-08 20:42:47 +01:00
Mateusz Konieczny
7a72b6dca7 prevent overlap 2022-12-08 20:16:02 +01:00
Mateusz Konieczny
efab635407 show some INSPIRE parcels 2022-12-08 20:15:53 +01:00
Mateusz Konieczny
a6156d66a3 add switchable borough boundary overlay 2022-12-08 20:15:52 +01:00
Mateusz Konieczny
79c2a8f37f italics for disclaimer 2022-12-08 20:15:12 +01:00
Mateusz Konieczny
0b0d536664 add warning that category is not yet activated 2022-12-07 16:10:17 +01:00
Mateusz Konieczny
b1d7618ba4 add more instructions 2022-12-07 14:12:55 +01:00
Mateusz Konieczny
c5803ef24c tweak description/question about upcoming applications 2022-12-07 13:46:56 +01:00
Mateusz Konieczny
f3fb5c982c drop placeholders about not activated category 2022-12-07 13:19:11 +01:00
Mateusz Konieczny
b9d98f069b better colours
no longer clashing with selection outline
2022-12-07 13:17:16 +01:00
Mateusz Konieczny
d191326d3f box about not-yet activated crowdsourcing 2022-12-07 13:16:51 +01:00
Mike Simpson
00c926fd68
Merge pull request #1003 from matkoniecz/feature/mineral_colour
Tweak colour for mineral buildings
2022-12-07 12:15:49 +00:00
Mateusz Konieczny
246ab7a590 Tweak colour for mineral buildings
was almost exactly the same as an active outline
2022-12-07 13:12:18 +01:00
Mateusz Konieczny
270f584444 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-12-06 19:20:54 +01:00
Mike Simpson
9468529cc7 Crash Fix 2022-12-06 17:05:22 +00:00
Mike Simpson
a4f3340c20 Merge branch 'master' into colouring-core 2022-12-06 16:57:44 +00:00
Mike Simpson
543a576b5d Another pass at removing references to Colouring London 2022-12-06 16:55:10 +00:00
Mateusz Konieczny
3e0063ba4a collapse planning applications section 2022-12-06 17:34:09 +01:00
Mateusz Konieczny
583d18b3d4 tweak situation description 2022-12-06 17:31:56 +01:00
Mike Simpson
f15b9acd46
Merge pull request #999 from matkoniecz/feature/consistent_order
extremely minor refactoring for minor annoyance
2022-12-06 13:05:50 +00:00
Mateusz Konieczny
b8339f1588 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-12-06 13:40:44 +01:00
Mateusz Konieczny
2859dc7fb2 Consistent order
generateApiKey and deleteAccount ordered the same way as elsewhere
2022-12-06 13:37:19 +01:00
Mateusz Konieczny
ae1b30ce13 even longer titles
requested by Polly
2022-12-06 13:33:19 +01:00
Mateusz Konieczny
609848ea9d log in/registration to top
rearrange sidebar to move critically important to top
2022-12-06 11:59:02 +01:00
Mateusz Konieczny
88c332ae2c fix links exploding interface on Chrome
https://github.com/colouring-cities/colouring-london/issues/996
2022-12-06 11:46:12 +01:00
Mateusz Konieczny
19069a69d2 tweak displayed text 2022-12-05 19:26:25 +01:00
Mateusz Konieczny
c134b5e630 drop dead code 2022-12-05 12:23:57 +01:00
Mateusz Konieczny
c72749abf6 add note that category is not yet activated 2022-12-02 17:21:38 +01:00
Mateusz Konieczny
36678faaf0 better note 2022-12-02 17:11:10 +01:00
Mateusz Konieczny
94f2a93ebb fix TODO 2022-12-02 17:10:00 +01:00
Mateusz Konieczny
05f27e3a92 add placeholders explaining why questions are not yet activated 2022-12-02 17:04:35 +01:00
Mateusz Konieczny
626a425cdd Fix English grammar 2022-12-02 17:03:59 +01:00
Mateusz Konieczny
e5ca4f19f2 disable crowdsourcing 2022-12-02 17:01:36 +01:00
Mateusz Konieczny
9133ca787c drop dead code 2022-12-02 15:44:51 +01:00
Mateusz Konieczny
3fa0734951 explain potential low quality address data 2022-12-02 15:39:20 +01:00
Mateusz Konieczny
2033bad1a8 tweak description of planning id collection 2022-12-02 15:36:03 +01:00
Mateusz Konieczny
32752fe71e remove empty map layer 2022-12-02 15:30:12 +01:00
Mateusz Konieczny
5c3139ff6f drop unwanted layers 2022-12-02 15:28:50 +01:00
Mateusz Konieczny
7b8da1f6cb better whitespace 2022-12-02 15:26:09 +01:00
Mike Simpson
a1c69fdc13 Merge branch 'master' into colouring-core 2022-11-30 15:33:30 +00:00
Mike Simpson
f9999048ec More Config Changes
- Added project specific GitHub URL to config
- More changes to "Colouring Cities" where it seems appropriate
- More use of "Colouring {CityName}" across the site
2022-11-30 15:20:00 +00:00
Mateusz Konieczny
7039c0cefa Merge branch 'master' into feature/display-of-planning-data 2022-11-30 15:05:09 +01:00
Mateusz Konieczny
47014c1995 colour inline map switch mockup 2022-11-29 12:08:12 +01:00
Mateusz Konieczny
c036de76b9 rearrange colors of boxes for consistency 2022-11-29 12:02:21 +01:00
Mateusz Konieczny
d56a81bff6 crowdsourced finalizing initial interface 2022-11-29 11:45:49 +01:00
Mateusz Konieczny
69f753c0a4 rework disclaimers 2022-11-29 11:28:04 +01:00
Mateusz Konieczny
48841b0ab0 remove italics after all 2022-11-29 11:04:29 +01:00
Mateusz Konieczny
8c134968a9 rewrite organisation of planning menu 2022-11-28 11:26:57 +01:00
Mateusz Konieczny
aac5287628 rebuild Building protection, Zone menus 2022-11-28 11:02:41 +01:00
Mateusz Konieczny
9c4f7e0ee8 remove no longer needed development info box 2022-11-25 10:20:04 +01:00
Mateusz Konieczny
655fed8964 better describe planning applications 2022-11-25 10:19:09 +01:00
Mateusz Konieczny
09a5aadfe6 better describe predicted planning applications 2022-11-25 10:18:56 +01:00
Mateusz Konieczny
f610e0346b reword community_expected_planning_application 2022-11-25 10:18:39 +01:00
Mateusz Konieczny
cfc9930cc5 better describe predicted planning applications in planning section 2022-11-25 10:12:05 +01:00
Mateusz Konieczny
a4456b1bab reword historic area assesment 2022-11-25 10:11:34 +01:00
Mateusz Konieczny
6fcbbc700c Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-11-24 12:12:27 +01:00
Mateusz Konieczny
81d8aa124e note about coverage of data 2022-11-23 15:22:01 +01:00
Mateusz Konieczny
d604ba30d8 Tweak warning for designation/protection data quality 2022-11-23 13:10:39 +01:00
Mateusz Konieczny
ba6bd944fc tweak wording for older planning data 2022-11-23 11:48:48 +01:00
Mateusz Konieczny
c66038c036 Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data 2022-11-23 10:11:55 +01:00
Mike Simpson
9a913fa5aa
Merge pull request #985 from matkoniecz/feature/more_clear
Make more clear instructions for protected site menu
2022-11-23 09:10:40 +00:00
Mateusz Konieczny
d53a893ea5 tweak wording 2022-11-23 10:04:46 +01:00
Mateusz Konieczny
6965056b8b tweak default collapse state
as requested in #984
2022-11-23 09:11:19 +01:00
Mateusz Konieczny
3a05627af1 More clear instructions for protected site menu
fixes #982
2022-11-23 09:02:15 +01:00
Mateusz Konieczny
930fb11e6a show address data in planning data green box 2022-11-23 08:59:10 +01:00
Mateusz Konieczny
bec6277706 add special empty map
I am deeply unhappy about ugly disclaimer handling though right now I have no good ideas how to provide nicer display
2022-11-21 22:10:44 +01:00
Mateusz Konieczny
5ba6e270f2 more consistent intendation 2022-11-21 10:09:11 +01:00