Replace spinners in html.erb templates

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 83cb73ec59dba6a31303f9918df09f83d4bd37ab..44aa530d9b39e2dd4aa8399dba5cedbca42b4500 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -255,14 +255,20 @@ L.OSM.Map = L.Map.extend({
       this._objectLoader = {
         abort: function () {}
       };
+
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
+
       L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
-      L.marker(object.latLng, {
-        icon: object.icon,
-        opacity: 1,
-        interactive: true
-      }).addTo(this._objectLayer);
+
+      if (object.icon) {
+        L.marker(object.latLng, {
+          icon: object.icon,
+          opacity: 1,
+          interactive: true
+        }).addTo(this._objectLayer);
+      }
+
       if (callback) callback(this._objectLayer.getBounds());
     } else { // element or changeset handled by L.OSM.DataLayer
       var map = this;