From e256c837b56d9f1c40c0c57dd89db4825bc7489e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 23 Feb 2015 21:18:39 +0000 Subject: [PATCH] Eliminate templating from most javascript --- app/assets/javascripts/{embed.js.erb => embed.js} | 4 ++-- .../index/{directions.js.erb => directions.js} | 8 ++++---- .../index/{new_note.js.erb => new_note.js} | 6 +++--- app/assets/javascripts/index/{note.js.erb => note.js} | 6 +++--- .../javascripts/index/{notes.js.erb => notes.js} | 6 +++--- .../{leaflet.map.js.erb => leaflet.map.js} | 10 +++++----- app/assets/javascripts/osm.js.erb | 11 +++++++++++ 7 files changed, 31 insertions(+), 20 deletions(-) rename app/assets/javascripts/{embed.js.erb => embed.js} (89%) rename app/assets/javascripts/index/{directions.js.erb => directions.js} (96%) rename app/assets/javascripts/index/{new_note.js.erb => new_note.js} (95%) rename app/assets/javascripts/index/{note.js.erb => note.js} (94%) rename app/assets/javascripts/index/{notes.js.erb => notes.js} (92%) rename app/assets/javascripts/{leaflet.map.js.erb => leaflet.map.js} (95%) diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js similarity index 89% rename from app/assets/javascripts/embed.js.erb rename to app/assets/javascripts/embed.js index 59ef7f070..ba734706b 100644 --- a/app/assets/javascripts/embed.js.erb +++ b/app/assets/javascripts/embed.js @@ -28,10 +28,10 @@ window.onload = function () { if (args.marker) { L.marker(args.marker.split(','), {icon: L.icon({ - iconUrl: <%= asset_path('images/marker-icon.png').to_json %>, + iconUrl: OSM.MARKER_ICON, iconSize: new L.Point(25, 41), iconAnchor: new L.Point(12, 41), - shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>, + shadowUrl: OSM.MARKER_SHADOW, shadowSize: new L.Point(41, 41) })}).addTo(map); } diff --git a/app/assets/javascripts/index/directions.js.erb b/app/assets/javascripts/index/directions.js similarity index 96% rename from app/assets/javascripts/index/directions.js.erb rename to app/assets/javascripts/index/directions.js index faa922635..31144a547 100644 --- a/app/assets/javascripts/index/directions.js.erb +++ b/app/assets/javascripts/index/directions.js @@ -22,8 +22,8 @@ OSM.Directions = function (map) { }); var endpoints = [ - Endpoint($("input[name='route_from']"), <%= asset_path('marker-green.png').to_json %>), - Endpoint($("input[name='route_to']"), <%= asset_path('marker-red.png').to_json %>) + Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN), + Endpoint($("input[name='route_to']"), OSM.MARKER_RED) ]; function Endpoint(input, iconUrl) { @@ -35,7 +35,7 @@ OSM.Directions = function (map) { iconSize: [25, 41], iconAnchor: [12, 41], popupAnchor: [1, -34], - shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>, + shadowUrl: OSM.MARKER_SHADOW, shadowSize: [41, 41] }), draggable: true @@ -73,7 +73,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = true; - $.getJSON(document.location.protocol + '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { + $.getJSON(document.location.protocol + OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length == 0) { diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js similarity index 95% rename from app/assets/javascripts/index/new_note.js.erb rename to app/assets/javascripts/index/new_note.js index 9990da783..4fe3fcaeb 100644 --- a/app/assets/javascripts/index/new_note.js.erb +++ b/app/assets/javascripts/index/new_note.js @@ -8,17 +8,17 @@ OSM.NewNote = function(map) { var noteIcons = { "new": L.icon({ - iconUrl: "<%= image_path 'new_note_marker.png' %>", + iconUrl: OSM.NEW_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "open": L.icon({ - iconUrl: "<%= image_path 'open_note_marker.png' %>", + iconUrl: OSM.OPEN_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "closed": L.icon({ - iconUrl: "<%= image_path 'closed_note_marker.png' %>", + iconUrl: OSM.CLOSED_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }) diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js similarity index 94% rename from app/assets/javascripts/index/note.js.erb rename to app/assets/javascripts/index/note.js index 2c9e42210..2d4a8decf 100644 --- a/app/assets/javascripts/index/note.js.erb +++ b/app/assets/javascripts/index/note.js @@ -6,17 +6,17 @@ OSM.Note = function (map) { var noteIcons = { "new": L.icon({ - iconUrl: "<%= image_path('new_note_marker.png') %>", + iconUrl: OSM.NEW_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "open": L.icon({ - iconUrl: "<%= image_path('open_note_marker.png') %>", + iconUrl: OSM.OPEN_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "closed": L.icon({ - iconUrl: "<%= image_path('closed_note_marker.png') %>", + iconUrl: OSM.CLOSED_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }) diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js similarity index 92% rename from app/assets/javascripts/index/notes.js.erb rename to app/assets/javascripts/index/notes.js index 4e45cbe05..524b0b55f 100644 --- a/app/assets/javascripts/index/notes.js.erb +++ b/app/assets/javascripts/index/notes.js @@ -4,17 +4,17 @@ function initializeNotes(map) { var noteIcons = { "new": L.icon({ - iconUrl: "<%= image_path 'new_note_marker.png' %>", + iconUrl: OSM.NEW_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "open": L.icon({ - iconUrl: "<%= image_path 'open_note_marker.png' %>", + iconUrl: OSM.OPEN_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }), "closed": L.icon({ - iconUrl: "<%= image_path 'closed_note_marker.png' %>", + iconUrl: OSM.CLOSED_NOTE_MARKER, iconSize: [25, 40], iconAnchor: [12, 40] }) diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js similarity index 95% rename from app/assets/javascripts/leaflet.map.js.erb rename to app/assets/javascripts/leaflet.map.js index 14cddafce..2201afe68 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js @@ -261,9 +261,9 @@ L.OSM.Map = L.Map.extend({ L.Icon.Default.imagePath = "/images"; L.Icon.Default.imageUrls = { - "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>", - "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>", - "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>" + "/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, { @@ -277,11 +277,11 @@ L.extend(L.Icon.Default.prototype, { function getUserIcon(url) { return L.icon({ - iconUrl: url || <%= asset_path('marker-red.png').to_json %>, + iconUrl: url || OSM.MARKER_RED, iconSize: [25, 41], iconAnchor: [12, 41], popupAnchor: [1, -34], - shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>, + shadowUrl: OSM.MARKER_SHADOW, shadowSize: [41, 41] }); } diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 15c1682d5..d933043b5 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -9,6 +9,17 @@ OSM = { STATUS: <%= STATUS.to_json %>, MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>, OVERPASS_URL: <%= OVERPASS_URL.to_json %>, + NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, + + MARKER_GREEN: <%= image_path("marker-green.png").to_json %>, + MARKER_RED: <%= image_path("marker-red.png").to_json %>, + MARKER_ICON: <%= image_path("marker-icon.png").to_json %>, + MARKER_ICON_2X: <%= image_path("marker-icon-2x.png").to_json %>, + MARKER_SHADOW: <%= image_path("marker-shadow.png").to_json %>, + + NEW_NOTE_MARKER: <%= image_path("new_note_marker.png").to_json %>, + OPEN_NOTE_MARKER: <%= image_path("open_note_marker.png").to_json %>, + CLOSED_NOTE_MARKER: <%= image_path("closed_note_marker.png").to_json %>, apiUrl: function (object) { var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; -- 2.39.5