diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index d90205d5..20bb9c0c 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -1028,13 +1028,9 @@ - [typology_style_period] = "Early Medieval (410-1066)" + [typology_style_period] = "Medieval (410-1485)" - - [typology_style_period] = "Mid-Late Medieval (1066-1485)" - - [typology_style_period] = "Tudor (1485-1603)" @@ -1044,7 +1040,7 @@ - [typology_style_period] = "Georgian/William IV (1714-1837)" + [typology_style_period] = "Georgian (1714-1837)" @@ -1056,17 +1052,9 @@ - [typology_style_period] = "World War I (1914-18)" + [typology_style_period] = "WWI - WWII (1914-45)" - - [typology_style_period] = "Interwar (1918-39)" - - - - [typology_style_period] = "World War II (1939-45)" - - [typology_style_period] = "Post war (1945-1975)" @@ -1080,13 +1068,9 @@ - [typology_style_period] = "2000s/2010s" + [typology_style_period] = "2000s" - - [typology_style_period] = "2020s" - - 17061 diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts index d9d575dd..19815c58 100644 --- a/app/src/frontend/config/category-maps-config.ts +++ b/app/src/frontend/config/category-maps-config.ts @@ -323,21 +323,17 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = title: 'Architectural style', elements: [ { color: '#00B2CB', text: 'Roman (43AD-410)' }, - { color: '#00A9C6', text: 'Early Medieval (410-1066)' }, - { color: '#00A0C1', text: 'Mid-Late Medieval (1066-1485)' }, + { color: '#00A9C6', text: 'Medieval (410-1485)' }, { color: '#0097BC', text: 'Tudor (1485-1603)' }, { color: '#008EB7', text: 'Stuart (1603 -1714)' }, - { color: '#0085B2', text: 'Georgian/William IV (1714-1837)' }, + { color: '#0085B2', text: 'Georgian (1714-1837)' }, { color: '#007CAD', text: 'Victorian (1837-1901)' }, { color: '#0073A8', text: 'Edwardian (1901-1914)' }, - { color: '#006AA3', text: 'World War I (1914-18)' }, - { color: '#00619E', text: 'Interwar (1918-39)' }, - { color: '#005899', text: 'World War II (1939-45)' }, + { color: '#006AA3', text: 'WWI - WWII (1914-45)' }, { color: '#004F94', text: 'Post war (1945-1975)' }, { color: '#00468F', text: 'Postmodern (1975-1990)' }, { color: '#003D8A', text: '1990s' }, - { color: '#003485', text: '2000s/2010s' }, - { color: '#002C7C', text: '2020s' }, + { color: '#003485', text: '2000s' }, ] } }, diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts index d90e16ce..91ddb459 100644 --- a/app/src/frontend/config/data-fields-config.ts +++ b/app/src/frontend/config/data-fields-config.ts @@ -1501,21 +1501,17 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */ example: "High rise: Not part of a group/cluster", items: [ 'Roman (43AD-410)', - 'Early Medieval (410-1066)', - 'Mid-Late Medieval (1066-1485)', + 'Medieval (410-1485)', 'Tudor (1485-1603)', 'Stuart (1603 -1714)', - 'Georgian/William IV (1714-1837)', + 'Georgian (1714-1837)', 'Victorian (1837-1901)', 'Edwardian (1901-1914)', - 'World War I (1914-18)', - 'Interwar (1918-39)', - 'World War II (1939-45)', + 'WWI - WWII (1914-45)',, 'Post war (1945-1975)', 'Postmodern (1975-1990)', '1990s', - '2000s/2010s', - '2020s', + '2000s', ] }, typology_style_period_source_type: {