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

Merge branch 'fix/age-colours' into feature/538-planning-update

Browse Source
This commit is contained in:
Maciej Ziarkowski 2020-02-10 18:10:41 +00:00
commit 3bd8ad85ae
2 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/map_styles/polygon.xml
View File

@ -150,55 +150,27 @@
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter> <Filter>[date_year] &gt;= 1880 and [date_year] &lt; 1900</Filter>
<PolygonSymbolizer fill="#bb859b" /> <PolygonSymbolizer fill="#961259" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter> <Filter>[date_year] &gt;= 1860 and [date_year] &lt; 1880</Filter>
<PolygonSymbolizer fill="#8b3654" /> <PolygonSymbolizer fill="#4855a6" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter> <Filter>[date_year] &gt;= 1840 and [date_year] &lt; 1860</Filter>
<PolygonSymbolizer fill="#8f5385" /> <PolygonSymbolizer fill="#8f5385" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1820 and [date_year] &lt; 1840</Filter> <Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1840</Filter>
<PolygonSymbolizer fill="#56619b" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1800 and [date_year] &lt; 1820</Filter>
<PolygonSymbolizer fill="#6793b2" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1780 and [date_year] &lt; 1800</Filter>
<PolygonSymbolizer fill="#83c3b3" /> <PolygonSymbolizer fill="#83c3b3" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1760 and [date_year] &lt; 1780</Filter> <Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1800</Filter>
<PolygonSymbolizer fill="#adc88f" /> <PolygonSymbolizer fill="#adc88f" />
</Rule> </Rule>
<Rule> <Rule>
<Filter>[date_year] &gt;= 1740 and [date_year] &lt; 1760</Filter> <Filter>[date_year] &lt; 1700</Filter>
<PolygonSymbolizer fill="#83a663" /> <PolygonSymbolizer fill="#ffffff" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1720 and [date_year] &lt; 1740</Filter>
<PolygonSymbolizer fill="#77852d" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1700 and [date_year] &lt; 1720</Filter>
<PolygonSymbolizer fill="#69814e" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1680 and [date_year] &lt; 1700</Filter>
<PolygonSymbolizer fill="#d0c291" />
</Rule>
<Rule>
<Filter>[date_year] &gt;= 1660 and [date_year] &lt; 1680</Filter>
<PolygonSymbolizer fill="#918158" />
</Rule>
<Rule>
<Filter>[date_year] &lt; 1660</Filter>
<PolygonSymbolizer fill="#7a5732" />
</Rule> </Rule>
</Style> </Style>
<Style name="conservation_area"> <Style name="conservation_area">

17
app/src/frontend/map/legend.tsx
View File

@ -51,19 +51,12 @@ const LEGEND_CONFIG = {
{ color: '#e6711d', text: '1940–1960' }, { color: '#e6711d', text: '1940–1960' },
{ color: '#d73d3a', text: '1920–1940' }, { color: '#d73d3a', text: '1920–1940' },
{ color: '#ba221c', text: '1900–1920' }, { color: '#ba221c', text: '1900–1920' },
{ color: '#bb859b', text: '1880–1900' }, { color: '#961259', text: '1880–1900' },
{ color: '#8b3654', text: '1860–1880' }, { color: '#4855a6', text: '1860–1880' },
{ color: '#8f5385', text: '1840–1860' }, { color: '#8f5385', text: '1840–1860' },
{ color: '#56619b', text: '1820–1840' }, { color: '#83c3b3', text: '1800–1840' },
{ color: '#6793b2', text: '1800–1820' }, { color: '#adc88f', text: '1700–1800' },
{ color: '#83c3b3', text: '1780–1800' }, { color: '#ffffff', text: '<1700' },
{ color: '#adc88f', text: '1760–1780' },
{ color: '#83a663', text: '1740–1760' },
{ color: '#77852d', text: '1720–1740' },
{ color: '#69814e', text: '1700–1720' },
{ color: '#d0c291', text: '1680–1700' },
{ color: '#918158', text: '1660–1680' },
{ color: '#7a5732', text: '<1660' },
] ]
}, },
size: { size: {