X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e6ef6defb250c6a4720234c7dd91f8a2173662bc..42fa563e01493fd7a6e28d8053f84558e50d5322:/app/assets/javascripts/leaflet.extend.js.erb diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb index 8aa9c70ec..966d0276b 100644 --- a/app/assets/javascripts/leaflet.extend.js.erb +++ b/app/assets/javascripts/leaflet.extend.js.erb @@ -146,10 +146,32 @@ L.extend(L.Map.prototype, { map._objectLayer.addTo(map); } }); + }, + + removeObject: function() { + this._object = null; + if (this._objectLoader) this._objectLoader.abort(); + if (this._objectLayer) this.removeLayer(this._objectLayer); } }); -L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>; +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-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>" +}; + +L.extend(L.Icon.Default.prototype, { + _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl, + + _getIconUrl: function (name) { + var url = this._oldGetIconUrl(name); + return L.Icon.Default.imageUrls[url]; + } +}); L.Hash.prototype.parseHash = OSM.parseHash; L.Hash.prototype.formatHash = OSM.formatHash;