Skip to content

Commit

Permalink
Redesign interface listing protection
Browse files Browse the repository at this point in the history
Per @polly64 checkbox fields were removed and switch was made to using links as both as input method and for providing source.

It is no longer possible to just claim that something is listed/featured, entering data will now be also faster
  • Loading branch information
matkoniecz committed Sep 24, 2022
1 parent cbd99f4 commit 20f99e9
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 324 deletions.
42 changes: 5 additions & 37 deletions app/src/api/config/dataFields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,70 +169,38 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
edit: true,
verify: true,
},
planning_in_conservation_area: {
planning_in_conservation_area_url: {
edit: true,
verify: true,
},
planning_conservation_area_name: {
edit: true,
verify: true,
},
planning_in_list: {
edit: true,
verify: true,
},
planning_list_id: {
edit: true,
verify: true,
},
planning_list_cat: {
planning_in_conservation_area_source_url: {
edit: true,
verify: true,
},
planning_list_grade: {
edit: true,
verify: true,
},
planning_heritage_at_risk_id: {
edit: true,
verify: true,
},
planning_world_list_id: {
planning_heritage_at_risk_url: {
edit: true,
verify: true,
},
planning_in_glher: {
planning_world_list_url: {
edit: true,
verify: true,
},
planning_glher_url: {
edit: true,
verify: true,
},
planning_in_apa: {
edit: true,
verify: true,
},
planning_apa_name: {
edit: true,
verify: true,
},
planning_apa_tier: {
edit: true,
verify: true,
},
planning_in_local_list: {
planning_in_apa_url: {
edit: true,
verify: true,
},
planning_local_list_url: {
edit: true,
verify: true,
},
planning_in_historic_area_assessment: {
edit: true,
verify: true,
},
planning_historic_area_assessment_url: {
edit: true,
verify: true,
Expand Down
3 changes: 0 additions & 3 deletions app/src/frontend/building/data-container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
const categoryKeys = {};
const blackListedKeys = ['current_landuse_order',
'current_landuse_verified',
'planning_in_list',
'planning_list_id',
'planning_list_cat',
'planning_list_grade',
'likes_total',
'community_local_significance_total',
Expand Down
246 changes: 58 additions & 188 deletions app/src/frontend/building/data-containers/planning.tsx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/frontend/config/category-maps-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
[Category.Planning]: [{
mapStyle: 'planning_combined',
legend: {
title: 'Statutory protections',
title: 'Designation/protection',
disclaimer: 'All data relating to designated buildings should be checked on the National Heritage List for England or local authority websites where used for planning or development purposes',
elements: [
{ color: '#95beba', text: 'In conservation area'},
Expand Down
79 changes: 15 additions & 64 deletions app/src/frontend/config/data-fields-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -446,111 +446,62 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
example: "",
//tooltip: ,
},
planning_in_conservation_area: {
planning_in_conservation_area_url: {
category: Category.Planning,
title: "In a conservation area?",
example: true,
title: "Is the building in a <a href=\"https://historicengland.org.uk/listing/what-is-designation/local/conservation-areas/\" target=\"_blank\">Conservation Area</a>?",
example: "",
//tooltip: ,
},
planning_conservation_area_name: {
category: Category.Planning,
title: "Conservation area name",
title: "Conservation Area Name",
example: "",
//tooltip: ,
},
planning_in_list: {
category: Category.Planning,
title: "Is it listed on the National Heritage List for England?",
example: true,
//tooltip: ,
},
planning_nhle_link: {
category: Category.Planning,
title: "NHLE list entry link",
tooltip: "URL for National Heritage List for England entry",
example: ["", "", ""],
},
planning_list_id: {
category: Category.Planning,
title: "National Heritage List for England list id",
example: "121436",
//tooltip: ,
},
planning_list_cat: {
category: Category.Planning,
title: "National Heritage List for England list type",
title: "Is the building on the <a href=\"https://historicengland.org.uk/advice/hpg/heritage-assets/nhle/\" target=\"_blank\">National Heritage List for England</a>?",
example: "",
//tooltip: ,
},
planning_list_grade: {
category: Category.Planning,
title: "Listing grade",
title: "What is its grade?",
example: "II",
//tooltip: ,
},
planning_heritage_at_risk_id: {
planning_heritage_at_risk_url: {
category: Category.Planning,
title: "Heritage at risk list id",
title: "Is it on the <a href=\"https://historicengland.org.uk/advice/heritage-at-risk/search-register/\" target=\"_blank\">Heritage at Risk</a> register?",
example: "",
//tooltip: ,
},
planning_world_list_id: {
planning_world_list_url: {
category: Category.Planning,
title: "World heritage list id",
title: "Is it within a <a href=\"https://historicengland.org.uk/advice/hpg/has/whs/\" target=\"_blank\">World Heritage Site</a>?",
example: "",
//tooltip: ,
},
planning_in_glher: {
category: Category.Planning,
title: "In the Greater London Historic Environment Record?",
example: true,
//tooltip: ,
},
planning_glher_url: {
category: Category.Planning,
title: "Greater London Historic Environment Record link",
title: "Is it recorded on the <a href=\"https://historicengland.org.uk/advice/technical-advice/information-management/hers/\" target=\"_blank\">Historic Environment Record</a>?",
example: "",
//tooltip: ,
},
planning_in_apa: {
category: Category.Planning,
title: "In an Architectural Priority Area?",
example: true,
//tooltip: ,
},
planning_apa_name: {
planning_in_apa_url: {
category: Category.Planning,
title: "Architectural Priority Area name",
title: "Is it in an <a href=\"https://historicengland.org.uk/services-skills/our-planning-services/greater-london-archaeology-advisory-service/greater-london-archaeological-priority-areas/\" target=\"_blank\">Archaeological Priority Area</a>?",
example: "",
//tooltip: ,
},
planning_apa_tier: {
category: Category.Planning,
title: "Architectural Priority Area tier",
example: "2",
//tooltip: ,
},
planning_in_local_list: {
category: Category.Planning,
title: "Is locally listed?",
example: true,
//tooltip: ,
},
planning_local_list_url: {
category: Category.Planning,
title: "Local list link",
title: "Is it a <a href=\"https://historicengland.org.uk/advice/hpg/has/locallylistedhas/\" target=\"_blank\">Locally Listed Heritage Asset</a>?",
example: "",
//tooltip: ,
},
planning_in_historic_area_assessment: {
category: Category.Planning,
title: "Within a historic area assessment?",
example: true,
//tooltip: ,
},
planning_historic_area_assessment_url: {
category: Category.Planning,
title: "Historic area assessment link",
title: "Does it have an <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
example: "",
//tooltip: ,
},
Expand Down
18 changes: 9 additions & 9 deletions app/src/tiles/dataDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,26 +141,26 @@ const LAYER_QUERIES = {
geometry_id,
(
CASE
WHEN planning_list_cat = 'Listed Building' and planning_list_grade = 'I' THEN 'Grade I Listed'
WHEN planning_list_cat = 'Listed Building' and planning_list_grade = 'II*' THEN 'Grade II* Listed'
WHEN planning_list_cat = 'Listed Building' and planning_list_grade = 'II' THEN 'Grade II Listed'
WHEN planning_in_local_list THEN 'Locally Listed'
WHEN planning_list_grade = 'I' THEN 'Grade I Listed'
WHEN planning_list_grade = 'II*' THEN 'Grade II* Listed'
WHEN planning_list_grade = 'II' THEN 'Grade II Listed'
WHEN planning_local_list_url <> '' THEN 'Locally Listed'
ELSE 'None'
END
) AS listing_type,
planning_in_conservation_area
planning_in_conservation_area_url <> '' AS planning_in_conservation_area
FROM buildings
WHERE
planning_in_conservation_area
OR planning_in_local_list
OR planning_list_cat IS NOT NULL`,
planning_in_conservation_area_url <> ''
OR planning_local_list_url <> ''
OR planning_list_grade IS NOT NULL`,
conservation_area: `
SELECT
geometry_id
FROM
buildings
WHERE
planning_in_conservation_area = true`,
planning_in_conservation_area_url = true`,
sust_dec: `
SELECT
geometry_id,
Expand Down
18 changes: 5 additions & 13 deletions maintenance/extract_data/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,14 @@ This is the main table, containing almost all data collected by Colouring London
- `sust_dec`: DEC rating
- `sust_retrofit_date`: year of last significant retrofit
- `planning_portal_link`: link to an entry on https://www.planningportal.co.uk/
- `planning_in_conservation_area`: in a conservation area? (True/False)
- `planning_conservation_area_name`: conservation area name
- `planning_in_list`: in the National Heritage List for England? (True/False)
- `planning_list_id`: National Heritage List for England ID
- `planning_list_cat`: National Heritage List for England listing type
- `planning_in_conservation_area_url`: conservation area appraisal link
- `planning_in_conservation_area_url`: conservation area data source link
- `planning_list_grade`: National Heritage List for England listing grade
- `planning_heritage_at_risk_id`: on the Heritage at Risk list? (True/False)
- `planning_world_list_id`: UNESCO World Heritage list ID
- `planning_in_glher`: in the Greater London Historic Environment Record? (True/False)
- `planning_heritage_at_risk_url`: Heritage at Risk link
- `planning_world_list_url`: UNESCO World Heritage list id
- `planning_glher_url`: Greater London Historic Environment Record link
- `planning_in_apa`: in an Architectural Priority Area? (True/False)
- `planning_apa_name`: Architectural Priority Area name
- `planning_apa_tier`: Architectural Priority Area tier
- `planning_in_local_list`: in a local list? (True/False)
- `planning_in_apa_url`: an Archeological Priority Area (APA) link
- `planning_local_list_url`: local list reference link
- `planning_in_historic_area_assessment`: within a historic area assessment? (True/False)
- `planning_historic_area_assessment_url`: historic area assessment reference link
- `likes_total`: number of times the building has been liked by Colouring London users

Expand Down
14 changes: 5 additions & 9 deletions maintenance/extract_data/export_attributes.sql
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,18 @@ COPY (SELECT
construction_secondary_materials,
construction_roof_covering,
planning_portal_link,
planning_in_conservation_area,
planning_in_conservation_area_url,
planning_in_conservation_area_source_url,
planning_conservation_area_name,
planning_in_list,
planning_list_id,
planning_list_cat,
planning_list_grade,
planning_heritage_at_risk_id,
planning_world_list_id,
planning_in_glher,
planning_heritage_at_risk_url,
planning_world_list_url,
planning_glher_url,
planning_in_apa,
planning_apa_name,
planning_apa_tier,
planning_in_local_list,
planning_in_apa_url,
planning_local_list_url,
planning_in_historic_area_assessment,
planning_historic_area_assessment_url,
likes_total
FROM buildings)
Expand Down
26 changes: 26 additions & 0 deletions migrations/033.redesign_protection_designation.down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--into a single link from array of links
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_nhle_link;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_nhle_link text[];

--changed into URL
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_apa_url;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_apa boolean DEFAULT FALSE;

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_world_list_url;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_world_list_id int DEFAULT NULL;

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_heritage_at_risk_url;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_heritage_at_risk_id int DEFAULT NULL;

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area_url;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area boolean DEFAULT FALSE;

-- URL column exists already
ALTER TABLE ADD COLUMN IF NOT EXISTS planning_list_id int DEFAULT NULL;

ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_glher boolean DEFAULT FALSE;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_apa_name VARCHAR DEFAULT '';
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_apa_tier smallint DEFAULT NULL;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_local_list boolean DEFAULT FALSE;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_historic_area_assessment boolean DEFAULT FALSE;

43 changes: 43 additions & 0 deletions migrations/033.redesign_protection_designation.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
-- this type of links is expected:
-- 'https://historicengland.org.uk/listing/the-list/list-entry/1080446?section=official-list-entry'

UPDATE buildings
SET planning_nhle_link = CONCAT('https://historicengland.org.uk/listing/the-list/list-entry/', planning_list_id,
'?section=official-list-entry')
WHERE planning_nhle_link = ''
AND planning_list_id IS NOT NULL;


UPDATE buildings
SET planning_local_list_url = 'identified as listed: please replace with link'
WHERE planning_local_list_url = ''
AND planning_in_local_list;

--into a single link from array of links
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_nhle_link;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_nhle_link VARCHAR DEFAULT '';

--changed into URL
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_apa;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_apa_url VARCHAR DEFAULT '';

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_world_list_id;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_world_list_url VARCHAR DEFAULT '';

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_heritage_at_risk_id;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_heritage_at_risk_url VARCHAR DEFAULT '';

ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area;
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_url VARCHAR DEFAULT '';

-- URL column exists already
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_list_id;

--fully removed
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_glher;
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_apa_name;
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_apa_tier;
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_local_list;
ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_historic_area_assessment;

rg "planning_in_apa|planning_world_list_id|planning_heritage_at_risk_id|planning_in_conservation_area|planning_in_glher|planning_apa_name|planning_apa_tier|planning_in_local_list|planning_in_historic_area_assessment"

0 comments on commit 20f99e9

Please sign in to comment.