Merge remote-tracking branch 'origin/dev' into 61-add-slider-to-graphs-to-filter-graph-results

Author: citizen-dror

src/components/map/AccidentPopUp.tsx

@@ -18,21 +18,21 @@ const AccidentsPopUp: React.FC<IProps> = (({ data: x, language }) => {
   if (x.injured_type_hebrew !== undefined) {
     return (
       <Popup>
-        <div className={`text${language}`}>
-          <div><span style={pStyle}>{t('When')}:</span> {x.accident_timestamp.slice(0, 16)}, {x.day_in_week_hebrew}, {x.day_night_hebrew}</div>
-          <div><span style={pStyle}>{t('Who')}:</span> {x.injured_type_hebrew}, {x.injury_severity_hebrew}, {x.vehicle_vehicle_type_hebrew ? `${x.vehicle_vehicle_type_hebrew}, ` : ''} {x.sex_hebrew}, {x.age_group_hebrew}, {x.population_type_hebrew}</div>
-          <div><span style={pStyle}>{t('Where')}:</span>
+        <div style={{fontSize: '16px'}} className={`text${language}`}>
+          <div><span style={pStyle}>{t('When')}: </span>{x.accident_timestamp.slice(0, 16)}, {x.day_in_week_hebrew}, {x.day_night_hebrew}</div>
+          <div><span style={pStyle}>{t('Who')}: </span>{x.injured_type_hebrew}, {x.injury_severity_hebrew}, {x.vehicle_vehicle_type_hebrew ? `${x.vehicle_vehicle_type_hebrew}, ` : ''} {x.sex_hebrew}, {x.age_group_hebrew}, {x.population_type_hebrew}</div>
+          <div><span style={pStyle}>{t('Where')}: </span> 
             {x.accident_yishuv_name ? `${x.accident_yishuv_name}, ` : ''}
             {x.street1_hebrew ? `${x.street1_hebrew}, ` : ''}
             {x.street2_hebrew ? `${x.street2_hebrew}, ` : ''}
             {x.road1 ? `${t('Road')} ${x.road1}, ` : ''}
             {x.road2 ? `${x.road2}, ` : ''}
             {x.road_segment_name ? `${x.road_segment_name}, ` : ''}
             {x.road_type_hebrew}
-            {x.location_accuracy_hebrew ? ` (${x.location_accuracy_hebrew})` : ''} 
+            {x.location_accuracy_hebrew ? ` (${x.location_accuracy_hebrew})` : ''}
           </div>
-          <div><span style={pStyle}>{t('What')}:</span> {x.accident_type_hebrew} ({x.vehicles})</div>
-          <div><span style={pStyle}>{t('WhatRoad')}:</span> {x.speed_limit_hebrew ? `${x.speed_limit_hebrew}, ` : ''}{x.multi_lane_hebrew ? `${x.multi_lane_hebrew}, ` : ''}{x.one_lane_hebrew ? `${x.one_lane_hebrew}, ` : ''}{x.road_width_hebrew ? `${x.road_width_hebrew} ` : ''}</div>
+          <div><span style={pStyle}>{t('What')}: </span>{x.accident_type_hebrew} ({x.vehicles})</div>
+          <div><span style={pStyle}>{t('WhatRoad')}: </span>{x.speed_limit_hebrew ? `${x.speed_limit_hebrew}, ` : ''}{x.multi_lane_hebrew ? `${x.multi_lane_hebrew}, ` : ''}{x.one_lane_hebrew ? `${x.one_lane_hebrew}, ` : ''}{x.road_width_hebrew ? `${x.road_width_hebrew} ` : ''}</div>
         </div>
       </Popup>
     );

src/stores/filter/GroupBy.ts

@@ -61,7 +61,7 @@ export const initGroupMap = () => {
   map.set('lca', new  GroupBy('LocationAccuracy', 'lca'))
   map.set('city', new GroupBy('City', 'city', 20, 'd'));
   map.set('cpop', new GroupBy('CityByPop', 'cpop'));
-  map.set('st', new GroupBy('Street', 'st', 30, 'd'));
+  map.set('st', new GroupBy('Street', 'st', 40, 'd'));
   map.set('rd', new GroupBy('Road', 'rd', 20, 'd'));
   map.set('acc', new GroupBy('AccidentType', 'acc',0,'d'));
   map.set('selfacc', new GroupBy('SelfOrNotAcc', 'selfacc', 0, null, reGroupResultIsSelfAcc));