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

1867 Commits

Author SHA1 Message Date
Mike Simpson
b5103327c5 Tweaks (see #1186) 2023-06-23 22:25:35 +01:00
Mike Simpson
8b8c92afc3 Remove unnecessary(?) duplicate code 
The code for the entire category is duplicated here. I did a side by side comparison, but could see no difference between the code in either part of the if statement, so I have removed one copy and tidied up the other.

#1155
 2023-06-23 10:31:32 +01:00
Mike Simpson
e72d496e41 Fix categories menu resizing from Welcome to Category pages 2023-06-06 15:41:08 +01:00
Mike Simpson
0a38a3ec23 Revert for now 2023-06-06 15:03:22 +01:00
Mike Simpson
435d0cb2f3 Fix Key change buttons 2023-06-06 14:48:15 +01:00
Mike Simpson
2da2834a72 Fix historical maps (age and history) 
Will now change key when switching between historical maps and default view (building age)
 2023-06-06 13:54:42 +01:00
Mike Simpson
40285bef32 Remove unused code 2023-06-06 13:54:06 +01:00
Mike Simpson
355b1078c2 Fix Residential button toggle 2023-06-06 13:25:36 +01:00
Mike Simpson
afd4149021 Tweak Key text 2023-06-06 12:09:51 +01:00
Mike Simpson
d2c4c21280 Tweak data label 2023-06-06 12:09:41 +01:00
Mike Simpson
b6fad2774f Rename Subcategory 2023-06-06 12:08:59 +01:00
Mike Simpson
c8694ba0f5 Tweak logo to match new category layout 2023-05-31 21:37:02 +01:00
Mike Simpson
7b024ebb5c Activate fields on Age & History 
See issue #1169
 2023-05-31 21:36:53 +01:00
Mike Simpson
439e415c6e Changes for #1165 2023-05-31 21:05:02 +01:00
Mike Simpson
79918c7b9f OK, *this* is where the horizontal line is supposed to go! 
Moved it so it is always visible, not just when you are editing
 2023-05-31 12:53:18 +01:00
Mike Simpson
5efce50d4d Remove extraneous horizontal line 
Added because it wasn't displaying, but it appears to have fixed itself *facepalm*
 2023-05-31 12:18:34 +01:00
Mike Simpson
44ab9377dd Re-add missing horizontal line 2023-05-26 14:34:36 +01:00
Mike Simpson
e7b6b80938 Merge branch 'master' into feature/ui-refactor 2023-05-26 14:07:29 +01:00
Mateusz Konieczny
d5f0681e20 pass revisionId as needed 2023-05-25 13:08:03 +02:00
Mike Simpson
31c1c382f3 Remove Unused Retrofit fields 2023-05-24 15:43:15 +01:00
Mike Simpson
8487ce3afe Other Category Updates 
- Consistent Construction Date between Age and Team categories
- Disable unused Verify buttons
- Add missing Verify buttons
- Add tooltips to Disaster section
- Add new fields to database
 2023-05-24 14:53:14 +01:00
Mike Simpson
19c906fcc5 Size / Age & History Sources 
Adding source link(s) field to activated data sources in the Size category and the Age & History category
 2023-05-23 21:27:45 +01:00
Mike Simpson
4c32710358 Add "Common Source Types" list 
- This will be the default source type for all fields, unless they need custom data. Then we can manage and edit this list in multiple places
- Use in Location and Land Use pages
 2023-05-23 15:13:23 +01:00
Mike Simpson
4e348e7b54 Location + Land Use Sources 
- Add sources to multiple fields on Location + Land Use Categories
- Use data-fields-config properly instead of hard-coding some values
 2023-05-19 11:55:32 +01:00
Mike Simpson
715cdfaa02 More tweaks, mainly for consistency 2023-05-18 21:06:27 +01:00
Mike Simpson
79dec38f9f Add placeholder for Solar Panels data 2023-05-18 21:06:03 +01:00
Mike Simpson
38d53f26c8 Sidebar Tweaks 
Add horizontal line at bottom
Change style of horizontal likes in menu
Remove minimum height (now all subcategories are closed by default)
 2023-05-18 11:31:37 +01:00
Mike Simpson
6398426254 Change red layer buttons to blue 2023-05-18 11:16:18 +01:00
Mike Simpson
2ae1ff4d9a Adjust <hr> spacing 
Less space at the top (under save edits button)
More space when used as a divider in the main menu
 2023-05-18 10:12:57 +01:00
Mike Simpson
13cd09c727 Consistent capitalisation on sub-categories/labels 2023-05-17 15:46:48 +01:00
Mike Simpson
fdecc457c4 Fix for text scrolling behind the "save edits" box 2023-05-17 15:34:32 +01:00
Mike Simpson
71d21fb616 Fix bug where "save edits" box gets drawn over category title box 2023-05-17 15:31:43 +01:00
Mike Simpson
a26b4f8d86 Run "npx browserslist@latest --update-db" 
It's been nagging us to do this for ages!
 2023-05-16 17:37:30 +01:00
Mike Simpson
3332395351 Update URLs and Slugs to match category titles 2023-05-16 17:36:13 +01:00
Mike Simpson
5297f153e1 Rename files to match category titles 2023-05-16 17:16:20 +01:00
Mike Simpson
d14dea3d1a More UI Tweaks 
Mainly to improve consistency and readability across all categories/pages
Discussed in meeting with Polly 16/05
 2023-05-16 17:08:21 +01:00
Mike Simpson
f43e5f60fe WIP Various tweaks to category pages 
As discussed with Polly on 09/05/2023
 2023-05-12 16:43:20 +01:00
Mike Simpson
0a24d60c43 Tweaks to data fields 
Changes to wording and localisations using cc-config
 2023-05-12 16:41:53 +01:00
Mike Simpson
664cceec56 Add tooltips to year fields 2023-05-12 16:41:17 +01:00
Mike Simpson
42d42d7306 Add Category descriptions 2023-05-12 16:39:49 +01:00
Mike Simpson
e4026acef3 Make 'Age & History' Display on two lines 2023-05-12 16:39:02 +01:00
Mike Simpson
29522d2ce7 Starting to add some localisation 2023-05-12 16:38:39 +01:00
Mike Simpson
2c266d0c28 Merge branch 'feature/disaster-management' into feature/ui-refactor 2023-05-11 22:13:24 +01:00
Mike Simpson
2f60ec72ae Merge Local and Incoming Changes 2023-05-09 09:30:14 +01:00
Mike Simpson
3e431dbd5f Tweaks to label, as requested 2023-05-05 13:53:34 +01:00
Mike Simpson
8f9590adb6 WIP Disaster Start/End Dates 2023-04-21 13:41:03 +01:00
Mike Simpson
906ebd7431 Add Disaster Management section to Resilience Category 2023-04-17 21:48:21 +01:00
Mike Simpson
24705ece30 Update Land Use Key 
Change order and rename "Domestic Building" option
 2023-04-14 12:57:09 +01:00
Mike Simpson
8d15cf8adf Merge branch 'colouring-core' 2023-04-13 21:17:22 +01:00
Mike Simpson
a5c7e223dc Update cc-config.json 2023-04-13 21:16:46 +01:00
Mike Simpson
6dd8bed440
Merge branch 'master' into master 2023-04-13 15:00:08 +01:00
Mike Simpson
0c3562e9fd Tweaks to Welcome Text 
As requested by Polly
#1116
 2023-04-12 22:04:36 +01:00
dependabot[bot]
7432dbf1ed
Bump follow-redirects from 1.14.7 to 1.15.2 in /app 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.15.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-12 20:23:09 +00:00
Mike Simpson
d0c9806775
Merge pull request #1125 from colouring-cities/dependabot/npm_and_yarn/app/webpack-5.76.0 
Bump webpack from 5.24.0 to 5.76.0 in /app
 2023-04-12 21:22:38 +01:00
Mike Simpson
0b9c8dbe2c
Merge pull request #1123 from colouring-cities/dependabot/npm_and_yarn/app/url-parse-1.5.10 
Bump url-parse from 1.5.4 to 1.5.10 in /app
 2023-04-12 21:22:26 +01:00
Mike Simpson
67d1442206
Merge branch 'colouring-cities:master' into master 2023-04-06 15:51:45 +01:00
Mike Simpson
90af39dfaf Update historic maps to show Survival Status 2023-04-06 15:22:15 +01:00
Mike Simpson
07cb6b4846 Add Survival Source 2023-04-06 15:21:59 +01:00
Mike Simpson
d92456cdae Big Fix for Survival Status on some buildings 2023-04-06 15:21:41 +01:00
Mike Simpson
8418b5f6c0 WIP - Survival Status data saving 
Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
 2023-04-05 15:13:48 +01:00
dependabot[bot]
a468cd12e2
Bump webpack from 5.24.0 to 5.76.0 in /app 
Bumps [webpack](https://github.com/webpack/webpack) from 5.24.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.24.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-14 15:24:15 +00:00
dependabot[bot]
49eca09d51
Bump url-parse from 1.5.4 to 1.5.10 in /app 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:42:49 +00:00
dependabot[bot]
233c4ef277
Bump ansi-regex from 4.1.0 to 5.0.1 in /app 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:40:36 +00:00
Mike Simpson
b34b1bdae4
Merge pull request #1118 from colouring-cities/dependabot/npm_and_yarn/app/async-2.6.4 
Bump async from 2.6.3 to 2.6.4 in /app
 2023-03-10 16:39:36 +00:00
Mike Simpson
2892dae4bc
Merge pull request #1121 from colouring-cities/dependabot/npm_and_yarn/app/sharp-0.30.5 
Bump sharp from 0.28.3 to 0.30.5 in /app
 2023-03-10 16:39:28 +00:00
Mike Simpson
6fc902ae12
Merge pull request #1120 from colouring-cities/dependabot/npm_and_yarn/app/eventsource-1.1.2 
Bump eventsource from 1.1.0 to 1.1.2 in /app
 2023-03-10 16:39:14 +00:00
Mike Simpson
fa18db2882
Merge pull request #1119 from colouring-cities/dependabot/npm_and_yarn/app/terser-4.8.1 
Bump terser from 4.8.0 to 4.8.1 in /app
 2023-03-10 16:38:29 +00:00
dependabot[bot]
e9cf78d583
Bump sharp from 0.28.3 to 0.30.5 in /app 
Bumps [sharp](https://github.com/lovell/sharp) from 0.28.3 to 0.30.5.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.28.3...v0.30.5)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:46 +00:00
dependabot[bot]
f8ff1bb63c
Bump eventsource from 1.1.0 to 1.1.2 in /app 
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:38 +00:00
dependabot[bot]
aca897cfe5
Bump terser from 4.8.0 to 4.8.1 in /app 
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v4.8.0...v4.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:32 +00:00
dependabot[bot]
2283bbb96a
Bump async from 2.6.3 to 2.6.4 in /app 
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:28 +00:00
Mike Simpson
7aa106624d
Merge pull request #1108 from colouring-cities/dependabot/npm_and_yarn/app/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2 in /app
 2023-03-10 16:33:59 +00:00
Mike Simpson
75dc274251
Merge pull request #1109 from colouring-cities/dependabot/npm_and_yarn/app/qs-and-body-parser-and-express-6.11.0 
Bump qs, body-parser and express in /app
 2023-03-10 16:33:49 +00:00
Mike Simpson
484a0f0c82
Merge pull request #1110 from colouring-cities/dependabot/npm_and_yarn/app/decode-uri-component-0.2.2 
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
 2023-03-10 16:33:44 +00:00
Mike Simpson
a9b70788da
Merge pull request #1111 from colouring-cities/dependabot/npm_and_yarn/app/loader-utils-1.4.2 
Bump loader-utils from 1.4.0 to 1.4.2 in /app
 2023-03-10 16:33:37 +00:00
Mike Simpson
ec7a515e8b
Merge pull request #1113 from colouring-cities/dependabot/npm_and_yarn/app/minimist-1.2.8 
Bump minimist from 1.2.5 to 1.2.8 in /app
 2023-03-10 16:33:32 +00:00
traveller195
4dcd3de93a
change data definiton for tile mapstyle of 'location' and 'team' 
using Subquery/ nested SQL Qquery to only load those buildings, having at least a few collected data. The benefit is, that the mapstyle is not different for nodata buildings comparing different data categories. Now, if you compare nodata buildings in 'team' or 'location' with others, the stroke width is larger than the normal map style... loading only builidings with data avoids this problem of different map styles. It is a better and more performant solution than changing it in polygon.xml
see also c80f243c0d
 2023-03-08 15:30:39 +01:00
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