From 73984ad462bf171ea2ae6e6efd11726f8f9fcbef Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 7 Feb 2022 01:55:47 +0100 Subject: [PATCH] Convert SVGs with embedded png into proper SVG --- .../bike_repair_station.json | 10 +- .../bike_repair_station/broken_pump.svg | 84 ++++++++---- .../bike_repair_station/broken_pump_2.svg | 20 --- assets/layers/bike_repair_station/pump.svg | 90 ++++++++++--- .../bike_repair_station/repair_station.svg | 76 ++++++++--- .../repair_station_pump.svg | 123 ++++++++++++++---- assets/layers/drinking_water/drips.svg | 22 +++- 7 files changed, 314 insertions(+), 111 deletions(-) delete mode 100644 assets/layers/bike_repair_station/broken_pump_2.svg diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json index 458ef23545..ae860cdd31 100644 --- a/assets/layers/bike_repair_station/bike_repair_station.json +++ b/assets/layers/bike_repair_station/bike_repair_station.json @@ -682,7 +682,7 @@ "mapRendering": [ { "icon": { - "render": "./assets/layers/bike_repair_station/repair_station.svg", + "render": "pin:#88d32c;./assets/layers/bike_repair_station/repair_station.svg", "mappings": [ { "if": { @@ -691,7 +691,7 @@ "service:bicycle:pump:operational_status=broken" ] }, - "then": "./assets/layers/bike_repair_station/repair_station.svg" + "then": "pin:#88d32c;./assets/layers/bike_repair_station/repair_station.svg" }, { "if": { @@ -700,7 +700,7 @@ "service:bicycle:tools=yes" ] }, - "then": "./assets/layers/bike_repair_station/repair_station_pump.svg" + "then": "pin:#30abf0;./assets/layers/bike_repair_station/repair_station_pump.svg" }, { "if": { @@ -709,7 +709,7 @@ "service:bicycle:tools=no" ] }, - "then": "./assets/layers/bike_repair_station/broken_pump_2.svg" + "then": "pin:black;./assets/layers/bike_repair_station/broken_pump.svg" }, { "if": { @@ -723,7 +723,7 @@ } ] }, - "then": "./assets/layers/bike_repair_station/pump.svg" + "then": "pin:#e1783a;./assets/layers/bike_repair_station/pump.svg" } ] }, diff --git a/assets/layers/bike_repair_station/broken_pump.svg b/assets/layers/bike_repair_station/broken_pump.svg index 65545acf35..653b710289 100644 --- a/assets/layers/bike_repair_station/broken_pump.svg +++ b/assets/layers/bike_repair_station/broken_pump.svg @@ -1,23 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff --git a/assets/layers/bike_repair_station/broken_pump_2.svg b/assets/layers/bike_repair_station/broken_pump_2.svg deleted file mode 100644 index ce3f9b1c12..0000000000 --- a/assets/layers/bike_repair_station/broken_pump_2.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/layers/bike_repair_station/pump.svg b/assets/layers/bike_repair_station/pump.svg index e4c6ba4317..002cd28689 100644 --- a/assets/layers/bike_repair_station/pump.svg +++ b/assets/layers/bike_repair_station/pump.svg @@ -1,21 +1,77 @@ - - - - - + + + + + + - - + + - + - - - - - - - - + + + + + + + - \ No newline at end of file + diff --git a/assets/layers/bike_repair_station/repair_station.svg b/assets/layers/bike_repair_station/repair_station.svg index d996aa129b..782f1edb59 100644 --- a/assets/layers/bike_repair_station/repair_station.svg +++ b/assets/layers/bike_repair_station/repair_station.svg @@ -1,17 +1,59 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/assets/layers/bike_repair_station/repair_station_pump.svg b/assets/layers/bike_repair_station/repair_station_pump.svg index 5dd95642e0..086661f1f0 100644 --- a/assets/layers/bike_repair_station/repair_station_pump.svg +++ b/assets/layers/bike_repair_station/repair_station_pump.svg @@ -1,29 +1,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - \ No newline at end of file + + + + + + + + + diff --git a/assets/layers/drinking_water/drips.svg b/assets/layers/drinking_water/drips.svg index b267e1b444..c483b7c6ff 100644 --- a/assets/layers/drinking_water/drips.svg +++ b/assets/layers/drinking_water/drips.svg @@ -5,12 +5,30 @@ viewBox="0 0 499.99999 500" version="1.1" id="svg29" - xmlns:xlink="http://www.w3.org/1999/xlink" + sodipodi:docname="drips.svg" + inkscape:version="1.1.1 (1:1.1+202109281949+c3084ef5ed)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + + + transform="matrix(0.64131719,0,0,0.64131719,63.670174,26.053743)">