Skip to content

Commit 39ed7a6

Browse files
committed
Pull in changes from master for release 0.5.0
1 parent d6bd226 commit 39ed7a6

File tree

5 files changed

+729
-644
lines changed

5 files changed

+729
-644
lines changed

bower.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
{
22
"name": "web-map",
3-
"description": "The Built-in <map> Custom Element is a Polymer implementation of the HTML-Map-Element specification.",
3+
"description": "web-map Customized Built-In HTML <map> element Polymer implementation of the HTML-Map-Element specification.",
44
"main": "web-map.html",
55
"authors": [
6-
{"name": "Peter Rushforth" ,"email": "[email protected]"},
7-
{"name": "Maps for HTML Community Group", "email": "[email protected]", "homepage": "https://www.w3.org/community/maps4html/"}
6+
"Maps for HTML Community Group"
87
],
98
"homepage": "http://maps4html.github.io/Web-Map-Custom-Element/",
109
"license": "W3C",
1110
"keywords": [
12-
"framework",
1311
"web-components",
14-
"custom element",
15-
"component",
16-
"polyfill",
1712
"polymer",
18-
"web map",
1913
"web",
2014
"maps",
2115
"map",
@@ -33,9 +27,7 @@
3327
"tests"
3428
],
3529
"dependencies": {
36-
"mapml-leaflet-plugin": "Maps4HTML/MapML-Leaflet-Plugin#^0.4.0",
37-
"polymer-leaflet": "Maps4HTML/Polymer-Leaflet#v0.2.0-Polymer-Leaflet",
38-
"proj4leaflet ": "^1.0.0",
30+
"mapml-leaflet-plugin": "Maps4HTML/MapML-Leaflet-Plugin#^0.5.0",
3931
"polymer": "^1.5.0"
4032
},
4133
"devDependencies": {

map-area.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
// Leaflet markers use the options.title as a tooltip
8383
options['title'] = this.alt;
8484
}
85+
// hack
86+
L.Icon.Default.prototype.options.imagePath = M.MapMLLayer.prototype._detectImagePath(map._container);
8587
this._feature = L.marker(map.containerPointToLatLng(points[0]),options).addTo(map);
8688
} else if (this.shape === 'circle') {
8789
var pixelRadius = parseInt(this.coords.split(",")[2]),

0 commit comments

Comments
 (0)