Merge pull request #1348 from colouring-cities/interface/neuroaesthet…

…ic-sliders Interface/neuroaesthetic sliders
colouring-cities · Mar 14, 2024 · f5abdfe · f5abdfe
2 parents 40862b9 + 000e06b
commit f5abdfe
Show file tree

Hide file tree

Showing 12 changed files with 279 additions and 247 deletions.
diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
@@ -1052,7 +1052,7 @@
         </Rule>
         <Rule>
             <Filter>[community_building_hominess_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#e1fce5" />
         </Rule>
 
         <Rule>
@@ -1085,7 +1085,7 @@
         </Rule>
         <Rule>
             <Filter>[community_building_fascination_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#f1e1f7" />
         </Rule>
 
         <Rule>
@@ -1118,7 +1118,7 @@
         </Rule>
         <Rule>
             <Filter>[community_building_coherence_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#e1ebfc" />
         </Rule>
 
         <Rule>
@@ -1209,23 +1209,23 @@
     <Style name="community_streetscape_hominess_avg">
         <Rule>
             <Filter>[community_streetscape_hominess_avg] &gt; 4</Filter>
-            <PolygonSymbolizer fill="#00d924" />
+            <PolygonSymbolizer fill="#7fd900" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_hominess_avg] &gt; 3 and [community_streetscape_hominess_avg] &lt;= 4</Filter>
-            <PolygonSymbolizer fill="#3efa5e" />
+            <PolygonSymbolizer fill="#acfa3e" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_hominess_avg] &gt; 2 and [community_streetscape_hominess_avg] &lt;= 3</Filter>
-            <PolygonSymbolizer fill="#7dfa92" />
+            <PolygonSymbolizer fill="#c6fa7d" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_hominess_avg] &gt; 1 and [community_streetscape_hominess_avg] &lt;= 2</Filter>
-            <PolygonSymbolizer fill="#a8fab5" />
+            <PolygonSymbolizer fill="#d8faa8" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_hominess_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#f0fcde" />
         </Rule>
 
         <Rule>
@@ -1242,23 +1242,23 @@
     <Style name="community_streetscape_fascination_avg">
         <Rule>
             <Filter>[community_streetscape_fascination_avg] &gt; 4</Filter>
-            <PolygonSymbolizer fill="#b300fa" />
+            <PolygonSymbolizer fill="#fa0060" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_fascination_avg] &gt; 3 and [community_streetscape_fascination_avg] &lt;= 4</Filter>
-            <PolygonSymbolizer fill="#c33efa" />
+            <PolygonSymbolizer fill="#fa3e86" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_fascination_avg] &gt; 2 and [community_streetscape_fascination_avg] &lt;= 3</Filter>
-            <PolygonSymbolizer fill="#d97dfa" />
+            <PolygonSymbolizer fill="#fa7dad" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_fascination_avg] &gt; 1 and [community_streetscape_fascination_avg] &lt;= 2</Filter>
-            <PolygonSymbolizer fill="#e8bbfa" />
+            <PolygonSymbolizer fill="#fabbd3" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_fascination_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#fce8f0" />
         </Rule>
 
         <Rule>
@@ -1275,23 +1275,23 @@
     <Style name="community_streetscape_coherence_avg">
         <Rule>
             <Filter>[community_streetscape_coherence_avg] &gt; 4</Filter>
-            <PolygonSymbolizer fill="#005efa" />
+            <PolygonSymbolizer fill="#00e5fa" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_coherence_avg] &gt; 3 and [community_streetscape_coherence_avg] &lt;= 4</Filter>
-            <PolygonSymbolizer fill="#3e86fa" />
+            <PolygonSymbolizer fill="#3eeafa" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_coherence_avg] &gt; 2 and [community_streetscape_coherence_avg] &lt;= 3</Filter>
-            <PolygonSymbolizer fill="#7dabfa" />
+            <PolygonSymbolizer fill="#7df0fa" />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_coherence_avg] &gt; 1 and [community_streetscape_coherence_avg] &lt;= 2</Filter>
-            <PolygonSymbolizer fill="#bbd3fa" />
+            <PolygonSymbolizer fill="#bbf5fa " />
         </Rule>
         <Rule>
             <Filter>[community_streetscape_coherence_avg] &lt;= 1</Filter>
-            <PolygonSymbolizer fill="#fafafa" />
+            <PolygonSymbolizer fill="#e3fafc" />
         </Rule>
 
         <Rule>

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
@@ -1257,6 +1257,11 @@ export const buildingUserAttributesConfig = valueType<DataFieldConfig>()({
         edit: true,
         verify: false
     },
+    community_school_project_data: {
+        perUser: true,
+        edit: true,
+        verify: false
+    },
     community_local_significance: {
         perUser: true,
         edit: true,

diff --git a/app/src/frontend/building/data-components/slider-data-entry.tsx b/app/src/frontend/building/data-components/slider-data-entry.tsx
@@ -51,7 +51,7 @@ const SliderDataEntry: React.FunctionComponent<SliderDataEntryProps> = (props) =
                 />
             </div>
             <p className="slider-score">
-                Your score: {props.value?props.value:"None"} <span className="slider-average">Average: {props.average} ({props.votes} votes)</span>
+                Your score: {props.value?props.value:"Not yet entered"} <span className="slider-average">Average: {props.average} ({props.votes} voters)</span>
             </p>
         </Fragment>
     );

diff --git a/app/src/frontend/building/data-containers/community.css b/app/src/frontend/building/data-containers/community.css
@@ -8,4 +8,11 @@
     width: 100%;
     padding-right: 10px;
     margin-bottom: 10px;
+}
+
+.subtitle {
+    margin-top: 10px;
+    margin-bottom: 0px;
+    font-size: large;
+    font-weight: bold;
 }