Skip to content

Commit

Permalink
Pull in changes from master for release 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
prushforth committed Oct 14, 2018
1 parent d6bd226 commit 39ed7a6
Show file tree
Hide file tree
Showing 5 changed files with 729 additions and 644 deletions.
14 changes: 3 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
{
"name": "web-map",
"description": "The Built-in <map> Custom Element is a Polymer implementation of the HTML-Map-Element specification.",
"description": "web-map Customized Built-In HTML <map> element Polymer implementation of the HTML-Map-Element specification.",
"main": "web-map.html",
"authors": [
{"name": "Peter Rushforth" ,"email": "[email protected]"},
{"name": "Maps for HTML Community Group", "email": "[email protected]", "homepage": "https://www.w3.org/community/maps4html/"}
"Maps for HTML Community Group"
],
"homepage": "http://maps4html.github.io/Web-Map-Custom-Element/",
"license": "W3C",
"keywords": [
"framework",
"web-components",
"custom element",
"component",
"polyfill",
"polymer",
"web map",
"web",
"maps",
"map",
Expand All @@ -33,9 +27,7 @@
"tests"
],
"dependencies": {
"mapml-leaflet-plugin": "Maps4HTML/MapML-Leaflet-Plugin#^0.4.0",
"polymer-leaflet": "Maps4HTML/Polymer-Leaflet#v0.2.0-Polymer-Leaflet",
"proj4leaflet ": "^1.0.0",
"mapml-leaflet-plugin": "Maps4HTML/MapML-Leaflet-Plugin#^0.5.0",
"polymer": "^1.5.0"
},
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions map-area.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
// Leaflet markers use the options.title as a tooltip
options['title'] = this.alt;
}
// hack
L.Icon.Default.prototype.options.imagePath = M.MapMLLayer.prototype._detectImagePath(map._container);
this._feature = L.marker(map.containerPointToLatLng(points[0]),options).addTo(map);
} else if (this.shape === 'circle') {
var pixelRadius = parseInt(this.coords.split(",")[2]),
Expand Down
Loading

0 comments on commit 39ed7a6

Please sign in to comment.