From 0ff95a02f8019e0bdb9ad24c67dc15af7097811d Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Mon, 31 Mar 2025 14:25:05 +0200
Subject: [PATCH] Clean up old markers
---
app/assets/images/closed_note_marker.svg | 19 -------------------
app/assets/images/marker-blue.png | Bin 1519 -> 0 bytes
app/assets/images/marker-green.png | Bin 1462 -> 0 bytes
app/assets/images/marker-red.png | Bin 1462 -> 0 bytes
app/assets/images/marker-yellow.png | Bin 1462 -> 0 bytes
app/assets/images/new_note_marker.svg | 15 ---------------
app/assets/images/open_note_marker.svg | 19 -------------------
app/assets/javascripts/leaflet.map.js | 17 -----------------
app/assets/javascripts/osm.js.erb | 12 ------------
9 files changed, 82 deletions(-)
delete mode 100644 app/assets/images/closed_note_marker.svg
delete mode 100644 app/assets/images/marker-blue.png
delete mode 100644 app/assets/images/marker-green.png
delete mode 100644 app/assets/images/marker-red.png
delete mode 100644 app/assets/images/marker-yellow.png
delete mode 100644 app/assets/images/new_note_marker.svg
delete mode 100644 app/assets/images/open_note_marker.svg
diff --git a/app/assets/images/closed_note_marker.svg b/app/assets/images/closed_note_marker.svg
deleted file mode 100644
index 84e1048a4..000000000
--- a/app/assets/images/closed_note_marker.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/app/assets/images/marker-blue.png b/app/assets/images/marker-blue.png
deleted file mode 100644
index 98b6726162ba31b42c8a827fc73cf66a054176da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1519
zcmVP001cn1^@s6z>|W`000HHNkl@-W`!wgoxjDfKNDCBNF6E-!
zT2K_lIp+}Mjv!MM$AI;mwkI<&Sw>>Agt$*6ZbI?DrzcP;z0lg^m&1AA_j&&3J*O=d
zNQwr$@evU(^CbcR>!QMbcl^jnGE5L#b_de(5ng1;AZYAwq9fbghba4<@gZ_DpHlY#
znXNPU{2J%raJvz^n08T>3@6u&tR?)Mta=>OQw=`k
z>}{*;#L9a(*v28Tp0Pt?bPG(7Y41a#=tXATT{`w4p59RzP1F25HMXls*BSX5>iZAz
z5kwSpTaE8(oZ)woaGtT*(_*H#=Ma$77j*d&%l=jl@pTNOtMFr*ySO#|7o5FjpUoq#xEK5MCL}i+9cp)I$3eYS
zg7ExX!boKw_O?)REn~Bz-iY)@0}j@WI1PCD@+GfkfSzI11MFE-pVCCZb(5g}odQu_
zr!=Z~0K4@ZqH7qNv}Ss!)e}&5&bSP)SS%Rho+7$r$e~`=U_|n{DNz4Wf#}T7k=C7L
z=r}}a8Jm;_3eip=|HhQdfW^f{3^22ZQ4KrPC)JyfR67ak-%BAkH;D_nu&bHFwkpOZ
zu7*Ww1B(=O9~LZ2b|FhkOITP~;N@L^gv6=|q&AxE>gghB{2{2nP7o&l$%o9RHkuHr
zWg)I)Y|@(OK9`Q7y5DHG3)%r6aL+u8ZOVRrT}-uOZJc@x)H`1gcKU`@XF}y8O6L$>
z&a9x_(0!$CN0*EsyKNjZf6n2*g+)Am`V0+&EF^h1;jB(v!SG|^f^JZ6p&&H(M=P16
zuopY)IfQ8#J2BNpeq37q5aP2v)*?jYcOj;946-`bS&eNy^&RFv@u4}_S4_lLPC|Ch
zj8HXWN2Fnqbe?k%Q*Cls8%Ai3cF_asDP0cvVMV5-u%E7u!`4#fb@BC5%>=05sO?)g
z
z0@XhzK6W9&-(Fd319=`(X+p5dhz}KvM`Efti1PbEwO{bf?L*p~(M2f65M9Y(OChta
zaJ31M>KRboEP2B*gEX6{4u
z>+vOXAw>pkp{w7JL(fCbAf&_u8n=)w>xKjz)q6q}lskanVl&=8W#ErN@)6K@huZ*K
z$X7Z~Y$Pv)N)z6bvk(@U5tw}iG#27vNVBJOfw^}Oq@)1(80fs02s{fp((EZ=z_E4&
zD$EEtehqXkC7y-&A8GPNcfjc}(D9e$a}PtlZ1l!<|LhLXF>U$W;}CDP5`i}%{{u!z
VXVI7O#Mb}-002ovPDHLkV1gaj)DQpw
diff --git a/app/assets/images/marker-green.png b/app/assets/images/marker-green.png
deleted file mode 100644
index f0e64e747fa04ea73fb837f4f141e255c35268a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1462
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
N5NdFEkRX6j@E-@izJdS%
diff --git a/app/assets/images/new_note_marker.svg b/app/assets/images/new_note_marker.svg
deleted file mode 100644
index c84444b5b..000000000
--- a/app/assets/images/new_note_marker.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/app/assets/images/open_note_marker.svg b/app/assets/images/open_note_marker.svg
deleted file mode 100644
index a1b4381c6..000000000
--- a/app/assets/images/open_note_marker.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 57c1a3526..640dc5b1b 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -352,23 +352,6 @@ L.OSM.Map = L.Map.extend({
}
});
-L.Icon.Default.imagePath = "/images/";
-
-L.Icon.Default.imageUrls = {
- "/images/marker-icon.png": OSM.MARKER_ICON,
- "/images/marker-icon-2x.png": OSM.MARKER_ICON_2X,
- "/images/marker-shadow.png": OSM.MARKER_SHADOW
-};
-
-L.extend(L.Icon.Default.prototype, {
- _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
-
- _getIconUrl: function (name) {
- const url = this._oldGetIconUrl(name);
- return L.Icon.Default.imageUrls[url];
- }
-});
-
OSM.isDarkMap = function () {
const mapTheme = $("body").attr("data-map-theme");
if (mapTheme) return mapTheme === "dark";
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 842868ec9..afdce3021 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -31,18 +31,6 @@ OSM = {
LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml", :legends => "config/legend.yml").to_json %>,
- MARKER_BLUE: <%= image_path("marker-blue.png").to_json %>,
- MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
- MARKER_RED: <%= image_path("marker-red.png").to_json %>,
-
- MARKER_ICON: <%= image_path("leaflet/dist/images/marker-icon.png").to_json %>,
- MARKER_ICON_2X: <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>,
- MARKER_SHADOW: <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>,
-
- NEW_NOTE_MARKER: <%= image_path("new_note_marker.svg").to_json %>,
- OPEN_NOTE_MARKER: <%= image_path("open_note_marker.svg").to_json %>,
- CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.svg").to_json %>,
-
apiUrl: function (object) {
const apiType = object.type === "note" ? "notes" : object.type;
let url = "/api/" + OSM.API_VERSION + "/" + apiType + "/" + object.id;
--
2.39.5