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

Merge pull request #1222 from colouring-cities/interface/ui-tweaks

Browse Source 
Interface/UI tweaks
This commit is contained in:
Mike Simpson 2023-08-02 16:10:33 +01:00 committed by GitHub
commit 6d13ab8048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/map_styles/polygon.xml
View File

@ -1025,51 +1025,47 @@
<Style name="typology_style_period"> <Style name="typology_style_period">
<Rule> <Rule>
<Filter>[typology_style_period] = "Roman (43AD-410)"</Filter> <Filter>[typology_style_period] = "Roman (43AD-410)"</Filter>
<PolygonSymbolizer fill="#a35" /> <PolygonSymbolizer fill="#FFF739" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Medieval (410-1485)"</Filter> <Filter>[typology_style_period] = "Medieval (410-1485)"</Filter>
<PolygonSymbolizer fill="#c66" /> <PolygonSymbolizer fill="#C5BD00" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Tudor (1485-1603)"</Filter> <Filter>[typology_style_period] = "Tudor (1485-1603)"</Filter>
<PolygonSymbolizer fill="#e94" /> <PolygonSymbolizer fill="#FF9A39" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Stuart (1603 -1714)"</Filter> <Filter>[typology_style_period] = "Stuart (1603 -1714)"</Filter>
<PolygonSymbolizer fill="#ed0" /> <PolygonSymbolizer fill="#C56000" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Georgian (1714-1837)"</Filter> <Filter>[typology_style_period] = "Georgian (1714-1837)"</Filter>
<PolygonSymbolizer fill="#9d5" /> <PolygonSymbolizer fill="#EA8072" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Victorian (1837-1901)"</Filter> <Filter>[typology_style_period] = "Victorian (1837-1901)"</Filter>
<PolygonSymbolizer fill="#4d8" /> <PolygonSymbolizer fill="#A71200" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Edwardian (1901-1914)"</Filter> <Filter>[typology_style_period] = "Edwardian (1901-1914)"</Filter>
<PolygonSymbolizer fill="#2cb" /> <PolygonSymbolizer fill="#A272D4" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "WWI - WWII (1914-45)"</Filter> <Filter>[typology_style_period] = "WWI - WWII (1914-45)"</Filter>
<PolygonSymbolizer fill="#0bc" /> <PolygonSymbolizer fill="#3988C5" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Post war (1945-1975)"</Filter> <Filter>[typology_style_period] = "Post war (1945-1975)"</Filter>
<PolygonSymbolizer fill="#09c" /> <PolygonSymbolizer fill="#5ADFA2" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "Postmodern (1975-1990)"</Filter> <Filter>[typology_style_period] = "Late 20th Century (1975-2000)"</Filter>
<PolygonSymbolizer fill="#36b" /> <PolygonSymbolizer fill="#C2F47A" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[typology_style_period] = "1990s"</Filter> <Filter>[typology_style_period] = "Early 21st Century (2000-Present)"</Filter>
<PolygonSymbolizer fill="#639" /> <PolygonSymbolizer fill="#6FB40A" />
</Rule>
<Rule>
<Filter>[typology_style_period] = "2000s"</Filter>
<PolygonSymbolizer fill="#949" />
</Rule> </Rule>
<Rule> <Rule>

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

@ -322,18 +322,17 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
legend: { legend: {
title: 'Architectural style', title: 'Architectural style',
elements: [ elements: [
{ color: '#a35', text: 'Roman (43AD-410)' }, { color: '#FFF739', text: 'Roman (43AD-410)' },
{ color: '#c66', text: 'Medieval (410-1485)' }, { color: '#C5BD00', text: 'Medieval (410-1485)' },
{ color: '#e94', text: 'Tudor (1485-1603)' }, { color: '#FF9A39', text: 'Tudor (1485-1603)' },
{ color: '#ed0', text: 'Stuart (1603 -1714)' }, { color: '#C56000', text: 'Stuart (1603 -1714)' },
{ color: '#9d5', text: 'Georgian (1714-1837)' }, { color: '#EA8072', text: 'Georgian (1714-1837)' },
{ color: '#4d8', text: 'Victorian (1837-1901)' }, { color: '#A71200', text: 'Victorian (1837-1901)' },
{ color: '#2cb', text: 'Edwardian (1901-1914)' }, { color: '#A272D4', text: 'Edwardian (1901-1914)' },
{ color: '#0bc', text: 'WWI - WWII (1914-45)' }, { color: '#3988C5', text: 'WWI - WWII (1914-45)' },
{ color: '#09c', text: 'Post war (1945-1975)' }, { color: '#5ADFA2', text: 'Post war (1945-1975)' },
{ color: '#36b', text: 'Postmodern (1975-1990)' }, { color: '#C2F47A', text: 'Late C20th (1975-2000)' },
{ color: '#639', text: '1990s' }, { color: '#6FB40A', text: 'Early C21st (2000- )' },
{ color: '#949', text: '2000s' },
] ]
} }
}, },

9
app/src/frontend/config/data-fields-config.ts
View File

@ -697,7 +697,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
tooltip: "Refer to GEM Taxonomy [<a href='https://taxonomy.openquake.org/terms/roof-shape'>LINK</a>]", tooltip: "Refer to GEM Taxonomy [<a href='https://taxonomy.openquake.org/terms/roof-shape'>LINK</a>]",
example: "Pitched with gable ends", example: "Pitched with gable ends",
items: [ items: [
"What kind of roof shape does the building have?", "Flat",
"Pitched with gable ends", "Pitched with gable ends",
"Pitched and hipped", "Pitched and hipped",
"Pitched with dormers", "Pitched with dormers",
@ -797,6 +797,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
'Stucco on light framing', 'Stucco on light framing',
'Vegetative (straw, matting etc)', 'Vegetative (straw, matting etc)',
'Cement based boards', 'Cement based boards',
'Other'
] ]
}, },
construction_internal_wall_source_type: { construction_internal_wall_source_type: {
@ -830,6 +831,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
'Stucco on light framing', 'Stucco on light framing',
'Vegetative (straw, matting etc)', 'Vegetative (straw, matting etc)',
'Cement based boards', 'Cement based boards',
'Other'
] ]
}, },
construction_external_wall_source_type: { construction_external_wall_source_type: {
@ -1777,9 +1779,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
'Edwardian (1901-1914)', 'Edwardian (1901-1914)',
'WWI - WWII (1914-45)',, 'WWI - WWII (1914-45)',,
'Post war (1945-1975)', 'Post war (1945-1975)',
'Postmodern (1975-1990)', 'Late 20th Century (1975-2000)',
'1990s', 'Early 21st Century (2000-Present)',
'2000s',
] ]
}, },
typology_style_period_source_type: { typology_style_period_source_type: {