diff --git a/web/app/views/tags/items_map.scala.html b/web/app/views/tags/items_map.scala.html index 9f4cf82fa8..f508450064 100644 --- a/web/app/views/tags/items_map.scala.html +++ b/web/app/views/tags/items_map.scala.html @@ -10,7 +10,6 @@ - @**@ @@ -84,10 +83,8 @@ var lat = @string((json \\ "lat").head) var lon = @string((json \\ "lon").head) var latlng@(id) = L.latLng(lat, lon); - var icon@(id) = L.MakiMarkers.icon({icon: "library", color: "#FA820A", size: "m"}); var marker@(id) = L.marker([lat, lon],{ - title: "@ownerName (@key)", - icon: icon@(id) + title: "@ownerName (@key)" }); markers[latlng@(id).toString()] = marker@(id); bindPopup@(id)(tableDetails); diff --git a/web/public/javascripts/Leaflet.MakiMarkers.js b/web/public/javascripts/Leaflet.MakiMarkers.js deleted file mode 100644 index a3a496cfeb..0000000000 --- a/web/public/javascripts/Leaflet.MakiMarkers.js +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Leaflet plugin to create map icons using Maki Icons from MapBox. - * - * References: - * Maki Icons: https://www.mapbox.com/maki/ - * MapBox Marker API: https://www.mapbox.com/developers/api/static/#markers - * - * Usage: - * var icon = L.MakiMarkers.icon({icon: "rocket", color: "#b0b", size: "m"}); - * - * License: - * MIT: http://jseppi.mit-license.org/ - */ - /*global L:false */ -(function () { - "use strict"; - L.MakiMarkers = { - // Available Maki Icons - icons: ["airfield","airport","alcohol-shop","america-football","art-gallery","bakery","bank","bar", - "baseball","basketball","beer","bicycle","building","bus","cafe","camera","campsite","car", - "cemetery","chemist","cinema","circle-stroked","circle","city","clothing-store","college", - "commercial","cricket","cross","dam","danger","disability","dog-park","embassy", - "emergency-telephone","entrance","farm","fast-food","ferry","fire-station","fuel","garden", - "golf","grocery","hairdresser","harbor","heart","heliport","hospital","industrial", - "land-use","laundry","library","lighthouse","lodging","logging","london-underground", - "marker-stroked","marker","minefield","mobilephone","monument","museum","music","oil-well", - "park2","park","parking-garage","parking","pharmacy","pitch","place-of-worship", - "playground","police","polling-place","post","prison","rail-above","rail-light", - "rail-metro","rail-underground","rail","religious-christian","religious-jewish", - "religious-muslim","restaurant","roadblock","rocket","school","scooter","shop","skiing", - "slaughterhouse","soccer","square-stroked","square","star-stroked","star","suitcase", - "swimming","telephone","tennis","theatre","toilets","town-hall","town","triangle-stroked", - "triangle","village","warehouse","waste-basket","water","wetland","zoo" - ], - defaultColor: "#0a0", - defaultIcon: "circle-stroked", - defaultSize: "m", - apiUrl: "https://api.tiles.mapbox.com/v3/marker/", - smallOptions: { - iconSize: [20, 50], - popupAnchor: [0,-20] - }, - mediumOptions: { - iconSize: [30,70], - popupAnchor: [0,-30] - }, - largeOptions: { - iconSize: [36,90], - popupAnchor: [0,-40] - } - }; - - L.MakiMarkers.Icon = L.Icon.extend({ - options: { - //Maki icon: any from https://www.mapbox.com/maki/ (ref: L.MakiMarkers.icons) - icon: L.MakiMarkers.defaultIcon, - //Marker color: short or long form hex color code - color: L.MakiMarkers.defaultColor, - //Marker size: "s" (small), "m" (medium), or "l" (large) - size: L.MakiMarkers.defaultSize, - shadowAnchor: null, - shadowSize: null, - shadowUrl: null, - className: "maki-marker" - }, - - initialize: function(options) { - var pin; - - options = L.setOptions(this, options); - - switch (options.size) { - case "s": - L.extend(options, L.MakiMarkers.smallOptions); - break; - case "l": - L.extend(options, L.MakiMarkers.largeOptions); - break; - default: - options.size = "m"; - L.extend(options, L.MakiMarkers.mediumOptions); - break; - } - - - pin = "pin-" + options.size; - - if (options.icon !== null) { - pin += "-" + options.icon; - } - - if (options.color !== null) { - if (options.color.charAt(0) === "#") { - options.color = options.color.substr(1); - } - - pin += "+" + options.color; - } - - options.iconUrl = "" + L.MakiMarkers.apiUrl + pin + ".png"; - options.iconRetinaUrl = L.MakiMarkers.apiUrl + pin + "@2x.png"; - } - }); - - L.MakiMarkers.icon = function(options) { - return new L.MakiMarkers.Icon(options); - }; -})(); diff --git a/web/public/javascripts/images/marker-icon.png b/web/public/javascripts/images/marker-icon-2x.png similarity index 100% rename from web/public/javascripts/images/marker-icon.png rename to web/public/javascripts/images/marker-icon-2x.png