Skip to content

Commit 58ea14b

Browse files
Merge pull request #41 from bevanhunt/update-leaflet
update leaflet version - breaking changes
2 parents 55f7411 + 31587bb commit 58ea14b

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

.npm/package/npm-shrinkwrap.json

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# ChangeLog
2+
3+
## 1.0.0
4+
- upgrade to Leaflet 1.0.0-beta.1
5+
- remove Leaflet MarkerCluster as it is imcompatable with Leaflet 1.0.0-beta.1

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ To provide a Meteor package to quickly build real-time cross-platform map apps.
88
Meteor Leafet Demo | [GitHub](https://github.com/bevanhunt/meteor-leaflet-demo) | [Demo](http://leaflet.meteor.com)
99

1010
## Packaged Libraries
11-
- Leaflet: 0.7.3
11+
- Leaflet: 1.0.0-beta.1
1212
- Leaflet Providers: 1.1.1
1313
- Leaflet Spin: 0.1.0
14-
- Leaflet Marker Cluster: 0.4.0
1514

1615
## Roadmap
1716
[Estimated Release Schedule](https://github.com/bevanhunt/meteor-leaflet/milestones)
@@ -73,4 +72,4 @@ Meteor Leafet Demo | [GitHub](https://github.com/bevanhunt/meteor-leaflet-demo
7372
I suggest the free web service - [Orge Web Service](http://ogre.adc4gis.com/)
7473

7574
## License
76-
MIT/X11
75+
MIT

package.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ Package.describe({
33
summary: "Leaflet.js, mobile-friendly interactive maps.",
44
git: "https://github.com/bevanhunt/meteor-leaflet.git",
55
author: "Bevan Hunt <[email protected]> (http://bevanhunt.com)",
6-
version: "0.3.18",
7-
license: "MIT/X11"
6+
version: "1.0.0",
7+
license: "MIT"
88
});
99

1010
Npm.depends({
1111
"spin.js": "2.3.1",
12-
"leaflet.markercluster": "0.4.0",
13-
"leaflet": "0.7.3",
12+
"leaflet": "1.0.0-beta.1",
1413
"leaflet-providers": "1.1.1"
1514
});
1615

@@ -19,9 +18,6 @@ Package.onUse(function (api) {
1918
api.addFiles([
2019
'.npm/package/node_modules/leaflet/dist/leaflet-src.js',
2120
'.npm/package/node_modules/leaflet-providers/leaflet-providers.js',
22-
'.npm/package/node_modules/leaflet.markercluster/dist/MarkerCluster.css',
23-
'.npm/package/node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css',
24-
'.npm/package/node_modules/leaflet.markercluster/dist/leaflet.markercluster.js',
2521
'.npm/package/node_modules/spin.js/spin.js',
2622
'lib/leaflet_spin.js',
2723
'styles/leaflet.css',
@@ -31,4 +27,4 @@ Package.onUse(function (api) {
3127
'images/marker-icon.png',
3228
'images/marker-shadow.png'
3329
],'client');
34-
});
30+
});

0 commit comments

Comments
 (0)