From de1fcd169bfad21eaa19b84ca8fea07d307540de Mon Sep 17 00:00:00 2001 From: Win Olario Date: Sun, 11 Apr 2021 19:48:12 +0800 Subject: [PATCH 1/3] Delete yellowfirehydrant.svg --- assets/themes/hailhydrant/yellowfirehydrant.svg | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 assets/themes/hailhydrant/yellowfirehydrant.svg diff --git a/assets/themes/hailhydrant/yellowfirehydrant.svg b/assets/themes/hailhydrant/yellowfirehydrant.svg deleted file mode 100644 index 2dd20a7..0000000 --- a/assets/themes/hailhydrant/yellowfirehydrant.svg +++ /dev/null @@ -1,5 +0,0 @@ - - -image/svg+xmlj4p4n \ No newline at end of file From 3a2dcde4ecf6a41af030be1f58b2815913738243 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Sun, 11 Apr 2021 19:48:46 +0800 Subject: [PATCH 2/3] update license_info.json, add hydrant.svg --- assets/themes/hailhydrant/hydrant.svg | 107 ++++++++++++++++++++ assets/themes/hailhydrant/license_info.json | 8 +- 2 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 assets/themes/hailhydrant/hydrant.svg diff --git a/assets/themes/hailhydrant/hydrant.svg b/assets/themes/hailhydrant/hydrant.svg new file mode 100644 index 0000000..0dbda22 --- /dev/null +++ b/assets/themes/hailhydrant/hydrant.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/themes/hailhydrant/license_info.json b/assets/themes/hailhydrant/license_info.json index 28d5111..eec8d11 100644 --- a/assets/themes/hailhydrant/license_info.json +++ b/assets/themes/hailhydrant/license_info.json @@ -8,11 +8,11 @@ ] }, { - "authors": ["https://openclipart.org/artist/j4p4n"], - "path": "yellowfirehydrant.svg", - "license": "CC0", + "authors": ["http://jaanos.deviantart.com/"], + "path": "hydrant.svg", + "license": "GPL", "sources": [ - "https://openclipart.org/detail/326295/yellow-fire-hydrant" + "https://commons.wikimedia.org/wiki/File:Hydrant.svg" ] }, { From 986eeac65892b7aba3abd92e1984cd0fb5357d29 Mon Sep 17 00:00:00 2001 From: Win Olario Date: Sun, 11 Apr 2021 21:52:42 +0800 Subject: [PATCH 3/3] Update hailhydrant.json Update layer icons, using more consistent themes. --- assets/themes/hailhydrant/hailhydrant.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index 667d79d..efd198b 100644 --- a/assets/themes/hailhydrant/hailhydrant.json +++ b/assets/themes/hailhydrant/hailhydrant.json @@ -92,7 +92,7 @@ ] }, "then": { - "en": " Pillar type." + "en": " Pillar type." } }, { @@ -102,7 +102,7 @@ ] }, "then": { - "en": " Pipe type." + "en": " Pipe type." } }, { @@ -112,7 +112,7 @@ ] }, "then": { - "en": " Wall type." + "en": " Wall type." } }, { @@ -122,7 +122,7 @@ ] }, "then": { - "en": " Underground type." + "en": " Underground type." } } ] @@ -175,7 +175,7 @@ ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/6/66/Hydrant_02.svg" + "render": "https://raw.githubusercontent.com/mapamore/MapComplete/master/assets/themes/hailhydrant/hydrant.svg" }, "width": { "render": "8" @@ -264,7 +264,7 @@ ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/e/e8/MUTCD_RS-090.svg" + "render": "https://upload.wikimedia.org/wikipedia/commons/9/9b/Twemoji12_1f9ef.svg" }, "width": { "render": "8" @@ -419,7 +419,7 @@ ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/8/84/British_Columbia_W-318-L.svg" + "render": "https://upload.wikimedia.org/wikipedia/commons/1/19/Twemoji12_1f692.svg" }, "width": { "render": "8" @@ -473,7 +473,7 @@ "tagRenderings": [], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { - "render": "https://upload.wikimedia.org/wikipedia/commons/1/1e/Emojione_1F6A8.svg" + "render": "https://upload.wikimedia.org/wikipedia/commons/e/eb/Twemoji12_26d1.svg" }, "width": { "render": "8"