Skip to content

cleanup; export utils; fix issues with vue2-leaflet-markercluster #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 13, 2018
Merged

cleanup; export utils; fix issues with vue2-leaflet-markercluster #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5792e7
Update main.js
naderio Mar 28, 2018
c676f46
Merge pull request #1 from naderio/patch-1
naderio Apr 1, 2018
73a25dc
remove unused parentMapObject state; fix for usage with vue2-leaflet…
Apr 1, 2018
7b0406a
rollback package version and dependency
Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/vue2-leaflet.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue2-leaflet.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue2-leaflet.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

7,128 changes: 7,009 additions & 119 deletions examples/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3,857 changes: 1 addition & 3,856 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/components/LCircle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LCircleMarker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LFeatureGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LLayerGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
20 changes: 18 additions & 2 deletions src/components/LMarker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const props = {
default: true,
},
latLng: {
type: [Object, Array]
type: [Object, Array],
custom: true,
},
icon: {
custom: false,
Expand All @@ -42,7 +43,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down Expand Up @@ -85,6 +85,22 @@ export default {
this.parentContainer.removeLayer(this);
}
}
},
setLatLng(newVal, oldVal) {
if (newVal == oldVal) return;
if (this.mapObject) {
let oldLatLng = oldVal ? {
lat: oldVal[0] || oldVal.lat,
lng: oldVal[1] || oldVal.lng,
} : {};
let newLatLng = {
lat: newVal[0] || newVal.lat,
lng: newVal[1] || newVal.lng,
};
if (newLatLng.lat != oldLatLng.lat || newLatLng.lng != oldLatLng.lng) {
this.mapObject.setLatLng(newLatLng);
}
}
}
}
};
Expand Down
1 change: 0 additions & 1 deletion src/components/LPolygon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LPolyline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LPopup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LRectangle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export default {
data() {
return {
ready: false,
parentMapObject: undefined
}
},
mounted() {
Expand Down
1 change: 0 additions & 1 deletion src/components/LTooltip.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default {
props: props,
data() {
return {
parentMapObject: undefined
}
},
mounted() {
Expand Down
3 changes: 3 additions & 0 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
exports.findRealParent = require('./utils/findRealParent').default;
exports.propsBinder = require('./utils/propsBinder').default;

exports.LCircle = require('./components/LCircle').default;
exports.LCircleMarker = require('./components/LCircleMarker').default;
exports.LControlAttribution = require('./components/LControlAttribution').default;
Expand Down