Merge pull request #711 from colouring-cities/feature/new-building-types

Feature/new building types

app/map_styles/polygon.xml

@@ -517,6 +517,10 @@
             <Filter>[current_landuse_order] = "Minerals"</Filter>
             <PolygonSymbolizer fill="#53f5dd" />
         </Rule>
+        <Rule>
+            <Filter>[current_landuse_order] = "Unclassified buildings"</Filter>
+            <PolygonSymbolizer fill="#6c6f8e" />
+        </Rule>
         <Rule>
             <Filter>[current_landuse_order] = "Recreation And Leisure"</Filter>
             <PolygonSymbolizer fill="#ffbfbf" />
@@ -531,7 +535,7 @@
         </Rule>
         <Rule>
             <Filter>[current_landuse_order] = "Residential"</Filter>
-            <PolygonSymbolizer fill="#4a54a6" />
+            <PolygonSymbolizer fill="#252aa6" />
         </Rule>
         <Rule>
             <Filter>[current_landuse_order] = "Community Services"</Filter>

app/src/frontend/config/category-maps-config.ts

@@ -193,7 +193,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             elements: [
                 { color: '#e5050d', text: 'Mixed Use' },
                 { subtitle: 'Single use:'},
-                { color: '#4a54a6', text: 'Residential' },
+                { color: '#252aa6', text: 'Residential' },
                 { color: '#ff8c00', text: 'Retail' },
                 { color: '#f5f58f', text: 'Industry & Business' },
                 { color: '#73ccd1', text: 'Community Services' },
@@ -203,7 +203,8 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
                 { color: '#898944', text: 'Defence' },
                 { color: '#fa667d', text: 'Agriculture' },
                 { color: '#53f5dd', text: 'Minerals' },
-                { color: '#ffffff', text: 'Vacant & Derelict' }
+                { color: '#ffffff', text: 'Vacant & Derelict' },
+                { color: '#6c6f8e', text: 'Unclassified buildings' }
             ]
         },
     }],

migrations/023.garden_buildings.down.sql

@@ -0,0 +1,2 @@
+DELETE FROM reference_tables.landuse_classifications WHERE landuse_id = 'U071X';
+DELETE FROM reference_tables.buildings_landuse_group WHERE landuse_id = 'U071X';

migrations/023.garden_buildings.up.sql

@@ -0,0 +1,14 @@
+-- equivalent to 015 migration
+INSERT INTO reference_tables.landuse_classifications
+(landuse_id, description, level, parent_id, is_used)
+VALUES
+-- group
+('U071X','Garden buildings','group','U070',True);
+
+
+-- equivalent to 016 migration
+INSERT INTO reference_tables.buildings_landuse_group
+(landuse_id, description, parent_order_id)
+VALUES
+-- group
+('U071X','Garden buildings','U070');

migrations/024.unclassified_buildings.down.sql

@@ -0,0 +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';

migrations/024.unclassified_buildings.up.sql

@@ -0,0 +1,30 @@
+-- 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);
+
+
+-- equivalent to 016 migration
+INSERT INTO reference_tables.buildings_landuse_order
+(landuse_id, description)
+VALUES
+-- order
+('U14X','Unclassified buildings');
+
+
+-- equivalent to 015 migration
+INSERT INTO reference_tables.landuse_classifications
+(landuse_id, description, level, parent_id, is_used)
+VALUES
+-- group
+('U072X','Unclassified, likely residential','group','U14X',True);
+
+
+-- equivalent to 016 migration
+INSERT INTO reference_tables.buildings_landuse_group
+(landuse_id, description, parent_order_id)
+VALUES
+-- group
+('U072X','Unclassified, likely residential','U14X');