5602245ec0
Change the px to % for width & height
2023-10-05 15:23:43 -04:00
01dab19220
Enlarge the map by changing the width value-5
2023-10-05 13:42:30 -04:00
5edfb2d48a
Enlarge the map by changing width (px was %) and height values-4
2023-10-05 13:39:06 -04:00
b8b5140944
Enlarge the map by changing width and height values-3
2023-10-05 13:37:26 -04:00
71dc5bb1a7
Enlarge the map by changing the height value
2023-10-05 13:35:14 -04:00
e5cc456d6b
Enlarge the map by changing width and height values
2023-10-05 13:33:17 -04:00
2c53688a8e
Remove theme from line 109
2023-10-05 13:24:03 -04:00
4d90354f0b
Replace CityBaseMapLayer them=.. with CityMap
2023-10-05 13:01:53 -04:00
ae46ec1547
Change the function to export function
2023-10-05 12:55:19 -04:00
5ac7bac38d
Replace CityMap with CityBaseMapLayer
2023-10-05 12:01:03 -04:00
3d94fd9e49
Replace CityBaseMapLayer with CityMap
2023-10-05 11:40:36 -04:00
89885fb83e
Test Changing the Land use menu
2023-09-21 14:58:30 -04:00
demianAdli
1630253b2d
Rounding the latitude and longitude values
2023-09-14 11:39:41 -04:00
ec1a21f0e6
Change the point coordinates in the cc-config.json
2023-08-25 14:58:26 -04: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
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
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
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
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
25bd2633e8
Changes to Colour Palettes
2023-07-27 12:22:50 +01:00
Mike Simpson
0169ca44a8
Revert "Add News and Discussions Links"
2023-07-27 11:38:37 +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
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
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
Mike Simpson
214b82c465
Changes to Dynamic classification subcategory
2023-07-26 13:54:57 +01:00
Mike Simpson
b55617aaae
Add label pointing to Age data
...
#1212
2023-07-26 13:46:42 +01:00
Mike Simpson
5e1db5a589
Changes to Architectural Styles
...
as requested in #1212
2023-07-26 13:34:32 +01:00
Mike Simpson
b9e9db4bc2
Tweak key text size
...
#1212
2023-07-25 17:06:38 +01:00
Mike Simpson
79adb2d49d
New Keys for Typology category
...
- Keys for all subcategories (except original building use)
- Buttons to change key/visible layer
Re: Issue #1212
2023-07-25 17:05:51 +01:00
Mike Simpson
49ab1c6836
Typology Section Updates
...
#1151
2023-07-18 12:32:44 +01:00
Mike Simpson
bcb0229ca7
Updates to Planning/Heritage Data Fields
...
#1188
2023-07-14 16:07:44 +01:00
Mike Simpson
8cab9bbe2c
Add standard source types (below historical ones)
...
#1193
2023-07-14 14:30:50 +01:00
Mike Simpson
85b0821490
Add link to Open Manual (Configurable)
...
Each project should configure this to point to their page on the open manual. (i.e. https://github.com/colouring-cities/manual/wiki/M3.-COLOURING-BRITAIN )
2023-07-14 13:35:53 +01:00
Mike Simpson
4be3b02e08
Add Synthetic Data to Common Source Types
2023-07-07 13:14:03 +01:00
Mike Simpson
9b73dd5e62
Activate fields in Planning Section
...
- Year of Completion #1197
- Incomplete/missing data #1198
2023-06-29 16:54:17 +01:00
Mike Simpson
1e41cc2e11
Green roof & solar panels
2023-06-29 15:21:20 +01:00
Mike Simpson
b44738e627
Change to logical/boolean questions
2023-06-29 14:51:31 +01:00
Mike Simpson
39d3031c64
Streetscape -> StreetContext
2023-06-29 14:41:15 +01:00
Mike Simpson
621601745b
Remove HR
2023-06-29 14:39:18 +01:00
Mike Simpson
3057d4fdc8
Typo fix
2023-06-29 14:37:11 +01:00
Mike Simpson
11258132e5
Remove placeholder field
2023-06-29 14:31:21 +01:00
Mike Simpson
fae06c6910
"Domestic" -> "Residential"
2023-06-29 14:30:32 +01:00
Mike Simpson
8b38f7a076
Team update
...
- Remove unused data from "General info"
- Fix logic of boolean question
- Update hints etc.
2023-06-29 14:29:23 +01:00
Mike Simpson
64969ecb7e
New links and bug fixes
...
- Add link to Discussions instead of the old forum
- Make sure external links are correctly flagged
- Make external links open in new tab
2023-06-29 13:52:11 +01:00
Mike Simpson
8edac435c1
Tweaks to common source types list
2023-06-29 13:51:15 +01:00
Mike Simpson
a765f94d20
Instruction text when editing
2023-06-29 13:50:49 +01:00
Mike Simpson
ff8618beb8
Calculate total floors
...
#1192
2023-06-29 11:09:12 +01:00
Mike Simpson
1708d6e5f0
Update menu links
...
See issue #1195
2023-06-29 10:53:17 +01:00
Mike Simpson
eb10575f36
Placeholders for possible new fields
2023-06-28 20:57:28 +01:00
Mike Simpson
dfb35a909f
Placeholder for new field
2023-06-28 20:35:03 +01:00
Mike Simpson
d36b16d179
Add land parcel geometry link to Planning
2023-06-28 20:32:15 +01:00
Mike Simpson
ad77c80a4e
Working tweak
2023-06-28 17:18:27 +01:00
Mike Simpson
392e9ced3d
Add links as an alternative to free-text names (Team)
2023-06-28 17:14:27 +01:00
Mike Simpson
fd1429e2da
Disable free-text boxes on Team category
...
Edit Multi Data Entry to display something when editing and the box is disabled when it has no data.
2023-06-28 16:40:45 +01:00
Mike Simpson
9f842dd445
Placeholder walkability index
2023-06-28 13:19:04 +01:00
Mike Simpson
0517222670
Add fields to Age and History
2023-06-28 13:16:11 +01:00
Mike Simpson
cc07121e08
Change domestic to residential
...
In interface but not in dropdowns/database yet
2023-06-28 10:21:35 +01:00
Mike Simpson
cfb441a273
Add tooltip to postcode
2023-06-28 10:11:12 +01:00
Mike Simpson
91eb5aeef8
Add alternative building footprint links (Location)
2023-06-27 19:47:40 +01:00
Mike Simpson
35611f87da
Add Building Name link
2023-06-27 19:39:19 +01:00
Mike Simpson
e150b1b36f
Change Land Use source to default source type
2023-06-27 16:48:33 +01:00
Mike Simpson
725d7710b9
Location category tweaks
...
- Add placeholder data fields
- Add Postcode Regex
- Add OSM ID Regex
- Allow Pattern Data Entry boxes to transform text (to force capitalise, for example)
- Add source links and update tooltips
- Cosmetic tweaks to CSS
2023-06-27 14:55:19 +01:00
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
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
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
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
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
