cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate templating from most javascript

Browse source
This commit is contained in:
Tom Hughes 2015-02-23 21:18:39 +00:00
parent 2cb166cf33
commit e256c837b5
7 changed files with 31 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/embed.js.erb → app/assets/javascripts/embed.js
View file

@ -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);
}

8
app/assets/javascripts/index/directions.js.erb → app/assets/javascripts/index/directions.js
View file

@ -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) {

6
app/assets/javascripts/index/new_note.js.erb → app/assets/javascripts/index/new_note.js
View file

@ -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]
})

6
app/assets/javascripts/index/note.js.erb → app/assets/javascripts/index/note.js
View file

@ -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]
})

6
app/assets/javascripts/index/notes.js.erb → app/assets/javascripts/index/notes.js
View file

@ -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]
})

10
app/assets/javascripts/leaflet.map.js.erb → app/assets/javascripts/leaflet.map.js
View file

@ -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]
});
}

11
app/assets/javascripts/osm.js.erb
View file

@ -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;