a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #763 from colouring-cities/feature/tweak-name

Browse Source 
Improve name of unclassified buildings
This commit is contained in:
Mateusz Konieczny 2022-02-14 13:38:44 +01:00 committed by GitHub
commit 18f365524f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/map_styles/polygon.xml
View File

@ -518,7 +518,7 @@
<PolygonSymbolizer fill="#53f5dd" />
</Rule>
<Rule>
<Filter>[current_landuse_order] = "Unclassified buildings"</Filter>
<Filter>[current_landuse_order] = "Unclassified, presumed non-residential"</Filter>
<PolygonSymbolizer fill="#6c6f8e" />
</Rule>
<Rule>

2
app/src/frontend/config/category-maps-config.ts
View File

@ -204,7 +204,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{ color: '#fa667d', text: 'Agriculture' },
{ color: '#53f5dd', text: 'Minerals' },
{ color: '#ffffff', text: 'Vacant & Derelict' },
{ color: '#6c6f8e', text: 'Unclassified buildings' }
{ color: '#6c6f8e', text: 'Unclassified, presumed non-residential' }
]
},
}],

7
app/src/frontend/map/legend.css
View File

@ -21,10 +21,6 @@
box-shadow: 0px 0px 1px 1px #222222;
}
.map-legend * {
flex: 0;
}
.map-legend .logo {
display: none;
}
@ -87,7 +83,7 @@
}
.data-legend li {
white-space: nowrap;
display: flex;
}
.data-legend .key {
@ -98,6 +94,7 @@
vertical-align: middle;
overflow: hidden;
border: solid 1px #ddd;
flex-shrink: 0;
}
.data-legend h6 {

1
migrations/023.garden_buildings.down.sql
View File

@ -1,2 +1,3 @@
-- note that you need to somehow reclassify such buildings, if present - before downgrading
DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U071X';
DELETE FROM reference_tables.buildings_landuse_group WHERE landuse_id = 'U071X';

8
migrations/024.unclassified_buildings.down.sql
View File

@ -1,4 +1,4 @@
DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U14X';
DELETE FROM reference_tables.buildings_landuse_order WHERE landuse_id = 'U14X';
DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U072X';
DELETE FROM reference_tables.buildings_landuse_group WHERE landuse_id = 'U072X';
DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U15X';
DELETE FROM reference_tables.buildings_landuse_order WHERE landuse_id = 'U15X';
DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U073X';
DELETE FROM reference_tables.buildings_landuse_group WHERE landuse_id = 'U073X';

10
migrations/024.unclassified_buildings.up.sql
View File

@ -1,9 +1,11 @@
-- note that you need to somehow reclassify such buildings, if present - before downgrading
-- equivalent to 015 migration
INSERT INTO reference_tables.landuse_classifications
(landuse_id, description, level, parent_id, is_used)
VALUES
-- order
('U14X','Unclassified buildings','order',NULL,True);
('U15X','Unclassified, presumed non-residential','order',NULL,True);
-- equivalent to 016 migration
@ -11,7 +13,7 @@ INSERT INTO reference_tables.buildings_landuse_order
(landuse_id, description)
VALUES
-- order
('U14X','Unclassified buildings');
('U15X','Unclassified, presumed non-residential');
-- equivalent to 015 migration
@ -19,7 +21,7 @@ INSERT INTO reference_tables.landuse_classifications
(landuse_id, description, level, parent_id, is_used)
VALUES
-- group
('U072X','Unclassified, likely residential','group','U14X',True);
('U073X','Unclassified, presumed non-residential','group','U15X',True);
-- equivalent to 016 migration
@ -27,4 +29,4 @@ INSERT INTO reference_tables.buildings_landuse_group
(landuse_id, description, parent_order_id)
VALUES
-- group
('U072X','Unclassified, likely residential','U14X');
('U073X','Unclassified, presumed non-residential','U15X');

33
migrations/025.actual.sql Normal file
View File

@ -0,0 +1,33 @@
INSERT INTO reference_tables.landuse_classifications
(landuse_id, description, level, parent_id, is_used)
VALUES
('U15X','Unclassified, presumed non-residential','order',NULL,True);
INSERT INTO reference_tables.buildings_landuse_order
(landuse_id, description)
VALUES
('U15X','Unclassified, presumed non-residential');
INSERT INTO reference_tables.landuse_classifications
(landuse_id, description, level, parent_id, is_used)
VALUES
('U073X','Unclassified, presumed non-residential','group','U15X',True);
INSERT INTO reference_tables.buildings_landuse_group
(landuse_id, description, parent_order_id)
VALUES
('U073X','Unclassified, presumed non-residential', 'U15X');
UPDATE buildings
SET current_landuse_order = 'Unclassified, presumed non-residential'
WHERE current_landuse_order = 'Unclassified buildings';
DELETE FROM reference_tables.landuse_classifications
WHERE landuse_id='U14X';
DELETE FROM reference_tables.buildings_landuse_order
WHERE landuse_id='U14X';
DELETE FROM reference_tables.landuse_classifications
WHERE landuse_id='U072X';
DELETE FROM reference_tables.buildings_landuse_group
WHERE landuse_id='U072X';