Name markers uniformly

Author: hlfan

app/assets/images/closed_note_marker.svg renamed to app/assets/images/marker-note-closed.svg

@@ -5,17 +5,17 @@ OSM.initializeNotesLayer = function (map) {
 
   const noteIcons = {
     "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_NEW,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_OPEN,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_CLOSED,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     })

app/assets/images/new_note_marker.svg renamed to app/assets/images/marker-note-new.svg

@@ -8,17 +8,17 @@ OSM.NewNote = function (map) {
 
   const noteIcons = {
     "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_NEW,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_OPEN,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_CLOSED,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     })

app/assets/images/open_note_marker.svg renamed to app/assets/images/marker-note-open.svg

@@ -4,17 +4,17 @@ OSM.Note = function (map) {
 
   const noteIcons = {
     "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_NEW,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_OPEN,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     }),
     "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
+      iconUrl: OSM.MARKER_NOTE_CLOSED,
       iconSize: [25, 40],
       iconAnchor: [12, 40]
     })

app/assets/javascripts/index/layers/notes.js

@@ -39,9 +39,9 @@ OSM = {
   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 %>,
+  MARKER_NOTE_NEW: <%= image_path("marker-note-new.svg").to_json %>,
+  MARKER_NOTE_OPEN: <%= image_path("marker-note-open.svg").to_json %>,
+  MARKER_NOTE_CLOSED: <%= image_path("marker-note-closed.svg").to_json %>,
 
   apiUrl: function (object) {
     const apiType = object.type === "note" ? "notes" : object.type;

app/assets/javascripts/index/new_note.js

@@ -41,9 +41,9 @@
     <tr<% if note.author == @user %> class="table-primary"<% end %>>
       <td>
         <% if note.closed? %>
-          <%= image_tag("closed_note_marker.svg", :alt => "closed", :width => 25, :height => 40) %>
+          <%= image_tag("marker-note-closed.svg", :alt => "closed", :width => 25, :height => 40) %>
         <% else %>
-          <%= image_tag("open_note_marker.svg", :alt => "open", :width => 25, :height => 40) %>
+          <%= image_tag("marker-note-open.svg", :alt => "open", :width => 25, :height => 40) %>
         <% end %>
       </td>
       <td><%= link_to note.id, note %></td>