From 6d517b552f7c2e5dbb9ea4ebd8cc47dbc94dc3cb Mon Sep 17 00:00:00 2001 From: jcardus Date: Sun, 4 Aug 2024 13:42:37 +0100 Subject: [PATCH 1/6] add finish icon --- src/map/core/preloadImages.js | 2 ++ src/reports/TripReportPage.jsx | 2 +- src/resources/images/icon/finish.svg | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/resources/images/icon/finish.svg diff --git a/src/map/core/preloadImages.js b/src/map/core/preloadImages.js index 19c3c35ea6..3f9fca3683 100644 --- a/src/map/core/preloadImages.js +++ b/src/map/core/preloadImages.js @@ -12,6 +12,7 @@ import carSvg from '../../resources/images/icon/car.svg'; import camperSvg from '../../resources/images/icon/camper.svg'; import craneSvg from '../../resources/images/icon/crane.svg'; import defaultSvg from '../../resources/images/icon/default.svg'; +import finishSvg from '../../resources/images/icon/finish.svg'; import helicopterSvg from '../../resources/images/icon/helicopter.svg'; import motorcycleSvg from '../../resources/images/icon/motorcycle.svg'; import offroadSvg from '../../resources/images/icon/offroad.svg'; @@ -36,6 +37,7 @@ export const mapIcons = { camper: camperSvg, crane: craneSvg, default: defaultSvg, + finish: finishSvg, helicopter: helicopterSvg, motorcycle: motorcycleSvg, offroad: offroadSvg, diff --git a/src/reports/TripReportPage.jsx b/src/reports/TripReportPage.jsx index 22fb9b9137..87864c7cc7 100644 --- a/src/reports/TripReportPage.jsx +++ b/src/reports/TripReportPage.jsx @@ -66,7 +66,7 @@ const TripReportPage = () => { { latitude: selectedItem.endLat, longitude: selectedItem.endLon, - image: 'default-success', + image: 'finish-success', }, ]); diff --git a/src/resources/images/icon/finish.svg b/src/resources/images/icon/finish.svg new file mode 100644 index 0000000000..4566c7cd59 --- /dev/null +++ b/src/resources/images/icon/finish.svg @@ -0,0 +1,4 @@ + + + + From 64a41d535338aad12c2486db1a384caf27f1fc36 Mon Sep 17 00:00:00 2001 From: jcardus Date: Thu, 10 Oct 2024 16:26:22 +0100 Subject: [PATCH 2/6] finish.svg with same size as others (24x24) --- src/resources/images/icon/finish.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resources/images/icon/finish.svg b/src/resources/images/icon/finish.svg index 4566c7cd59..bc49e3ba0e 100644 --- a/src/resources/images/icon/finish.svg +++ b/src/resources/images/icon/finish.svg @@ -1,4 +1,4 @@ - - - + + + From 146cea8db38b29a9311e47159be6654bb0ca70a2 Mon Sep 17 00:00:00 2001 From: jcardus Date: Thu, 10 Oct 2024 16:55:25 +0100 Subject: [PATCH 3/6] use padding (1px) add start.svg start is success and finish is neutral --- src/map/core/preloadImages.js | 2 ++ src/reports/TripReportPage.jsx | 4 +-- src/resources/images/icon/finish.svg | 16 ++++++++--- src/resources/images/icon/start.svg | 40 ++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/resources/images/icon/start.svg diff --git a/src/map/core/preloadImages.js b/src/map/core/preloadImages.js index 3f9fca3683..09886a6929 100644 --- a/src/map/core/preloadImages.js +++ b/src/map/core/preloadImages.js @@ -12,6 +12,7 @@ import carSvg from '../../resources/images/icon/car.svg'; import camperSvg from '../../resources/images/icon/camper.svg'; import craneSvg from '../../resources/images/icon/crane.svg'; import defaultSvg from '../../resources/images/icon/default.svg'; +import startSvg from '../../resources/images/icon/start.svg'; import finishSvg from '../../resources/images/icon/finish.svg'; import helicopterSvg from '../../resources/images/icon/helicopter.svg'; import motorcycleSvg from '../../resources/images/icon/motorcycle.svg'; @@ -46,6 +47,7 @@ export const mapIcons = { plane: planeSvg, scooter: scooterSvg, ship: shipSvg, + start: startSvg, tractor: tractorSvg, train: trainSvg, tram: tramSvg, diff --git a/src/reports/TripReportPage.jsx b/src/reports/TripReportPage.jsx index 87864c7cc7..ee9ea1c082 100644 --- a/src/reports/TripReportPage.jsx +++ b/src/reports/TripReportPage.jsx @@ -61,12 +61,12 @@ const TripReportPage = () => { { latitude: selectedItem.startLat, longitude: selectedItem.startLon, - image: 'default-error', + image: 'start-success', }, { latitude: selectedItem.endLat, longitude: selectedItem.endLon, - image: 'finish-success', + image: 'finish-neutral', }, ]); diff --git a/src/resources/images/icon/finish.svg b/src/resources/images/icon/finish.svg index bc49e3ba0e..d0ac7cc3d1 100644 --- a/src/resources/images/icon/finish.svg +++ b/src/resources/images/icon/finish.svg @@ -1,4 +1,14 @@ - - - + + + + diff --git a/src/resources/images/icon/start.svg b/src/resources/images/icon/start.svg new file mode 100644 index 0000000000..1e9d787eb4 --- /dev/null +++ b/src/resources/images/icon/start.svg @@ -0,0 +1,40 @@ + + + + + + + From 5fa2a8b1436ab60209dcd17ea53d4e2e6856fa9f Mon Sep 17 00:00:00 2001 From: jcardus Date: Thu, 10 Oct 2024 16:56:32 +0100 Subject: [PATCH 4/6] clean svg --- src/resources/images/icon/start.svg | 33 ++--------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/src/resources/images/icon/start.svg b/src/resources/images/icon/start.svg index 1e9d787eb4..16053f1f1c 100644 --- a/src/resources/images/icon/start.svg +++ b/src/resources/images/icon/start.svg @@ -2,39 +2,10 @@ - - - + xmlns="http://www.w3.org/2000/svg"> + /> From a9264667573bfc962b403287299d19739f123074 Mon Sep 17 00:00:00 2001 From: jcardus Date: Thu, 10 Oct 2024 17:06:21 +0100 Subject: [PATCH 5/6] use material icons --- src/resources/images/icon/finish.svg | 15 +-------------- src/resources/images/icon/start.svg | 12 +----------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/resources/images/icon/finish.svg b/src/resources/images/icon/finish.svg index d0ac7cc3d1..34c5ffed66 100644 --- a/src/resources/images/icon/finish.svg +++ b/src/resources/images/icon/finish.svg @@ -1,14 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/resources/images/icon/start.svg b/src/resources/images/icon/start.svg index 16053f1f1c..111292f151 100644 --- a/src/resources/images/icon/start.svg +++ b/src/resources/images/icon/start.svg @@ -1,11 +1 @@ - - - - + \ No newline at end of file From b6e4a2686d4ea324ffa6b8a1f874ec56789d3b2a Mon Sep 17 00:00:00 2001 From: jcardus Date: Thu, 10 Oct 2024 17:51:31 +0100 Subject: [PATCH 6/6] symmetry --- src/reports/TripReportPage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reports/TripReportPage.jsx b/src/reports/TripReportPage.jsx index ee9ea1c082..88512f9204 100644 --- a/src/reports/TripReportPage.jsx +++ b/src/reports/TripReportPage.jsx @@ -66,7 +66,7 @@ const TripReportPage = () => { { latitude: selectedItem.endLat, longitude: selectedItem.endLon, - image: 'finish-neutral', + image: 'finish-error', }, ]);