Skip to content

Commit 20e655b

Browse files
committed
Clean up old markers
1 parent 65505f7 commit 20e655b

9 files changed

+0
-82
lines changed

app/assets/images/closed_note_marker.svg

-19
This file was deleted.

app/assets/images/marker-blue.png

-1.48 KB
Binary file not shown.

app/assets/images/marker-green.png

-1.43 KB
Binary file not shown.

app/assets/images/marker-red.png

-1.43 KB
Binary file not shown.

app/assets/images/marker-yellow.png

-1.43 KB
Binary file not shown.

app/assets/images/new_note_marker.svg

-15
This file was deleted.

app/assets/images/open_note_marker.svg

-19
This file was deleted.

app/assets/javascripts/leaflet.map.js

-17
Original file line numberDiff line numberDiff line change
@@ -366,23 +366,6 @@ L.OSM.Map = L.Map.extend({
366366
}
367367
});
368368

369-
L.Icon.Default.imagePath = "/images/";
370-
371-
L.Icon.Default.imageUrls = {
372-
"/images/marker-icon.png": OSM.MARKER_ICON,
373-
"/images/marker-icon-2x.png": OSM.MARKER_ICON_2X,
374-
"/images/marker-shadow.png": OSM.MARKER_SHADOW
375-
};
376-
377-
L.extend(L.Icon.Default.prototype, {
378-
_oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
379-
380-
_getIconUrl: function (name) {
381-
const url = this._oldGetIconUrl(name);
382-
return L.Icon.Default.imageUrls[url];
383-
}
384-
});
385-
386369
OSM.isDarkMap = function () {
387370
const mapTheme = $("body").attr("data-map-theme");
388371
if (mapTheme) return mapTheme === "dark";

app/assets/javascripts/osm.js.erb

-12
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@ OSM = {
3030
LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml").to_json %>,
3131
LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>,
3232

33-
MARKER_BLUE: <%= image_path("marker-blue.png").to_json %>,
34-
MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
35-
MARKER_RED: <%= image_path("marker-red.png").to_json %>,
36-
37-
MARKER_ICON: <%= image_path("leaflet/dist/images/marker-icon.png").to_json %>,
38-
MARKER_ICON_2X: <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>,
39-
MARKER_SHADOW: <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>,
40-
41-
NEW_NOTE_MARKER: <%= image_path("new_note_marker.svg").to_json %>,
42-
OPEN_NOTE_MARKER: <%= image_path("open_note_marker.svg").to_json %>,
43-
CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.svg").to_json %>,
44-
4533
apiUrl: function (object) {
4634
const apiType = object.type === "note" ? "notes" : object.type;
4735
let url = "/api/" + OSM.API_VERSION + "/" + apiType + "/" + object.id;

0 commit comments

Comments
 (0)