Skip to content

allow to define groups of markers. #2

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

Open
lukasender wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow to define groups of markers. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 29 additions & 1 deletion assets/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,34 @@ $(function () {
]
});

$('.js-marker-group').smallworld({
geojson: data,
center: [45, -50],
markers: [
{
values: [
[37.757719928168605, -122.43760000000003],
[51.528868434293145, -0.10159864999991441]
],
markerColor: 'blue',
markerSize: 3
},
{
values: [
[40.705960705452846, -73.9780035]
]
// use default color and size
},
{
values: [
[-27.757719928168605, 122.43760000000003]
],
markerColor: 'red'
}
],
markerColor: 'black'
});

});

});
});
34 changes: 29 additions & 5 deletions dist/smallworld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,40 @@
},

addMarker: function (point, options) {


// check if 'point' is a group of markers
if (!(point instanceof Array) && typeof(point) !== "number") {
options = options || {};
// make a deep copy
var groupOptions = {};
groupOptions = JSON.parse(JSON.stringify(options));
if (point.markerColor !== undefined) {
groupOptions.markerColor = point.markerColor;
}
if (point.markerSize !== undefined) {
groupOptions.markerSize = point.markerSize;
}
for (var i = 0; i < point.values.length; i++) {
this.pAddMarker(point.values[i], groupOptions);
}
} else {
this.pAddMarker(point, options);
}

},

pAddMarker: function (point, options) {
options = options || {};

var center = this.coordinateToPoint(point[0], point[1]);


var markerSize = options.markerSize || this.options.markerSize;
var markerColor = options.markerColor || this.options.markerColor;

this.context.beginPath();
this.context.arc(center.x, center.y, this.options.markerSize, 0, 2 * Math.PI, false);
this.context.fillStyle = this.options.markerColor;
this.context.arc(center.x, center.y, markerSize, 0, 2 * Math.PI, false);
this.context.fillStyle = markerColor;
this.context.fill();

}

};
Expand Down
2 changes: 1 addition & 1 deletion dist/smallworld.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,41 @@ <h3>Markers</h3>
</div>
</div>

<div class="example">
<div class="example__map">
<div class="map js-marker-group"></div>
</div>

<div class="example__code">
<pre><code class="language-javascript">$('.map').smallworld({
center: [45, -50],
markers: [
{
values: [
[37.757719928168605, -122.43760000000003],
[51.528868434293145, -0.10159864999991441]
],
markerColor: 'blue',
markerSize: 3
},
{
values: [
[40.705960705452846, -73.9780035]
]
// use default color and size
},
{
values: [
[-27.757719928168605, 122.43760000000003]
],
markerColor: 'red'
}
],
markerColor: 'black'
});</code></pre>
</div>
</div>

<!-- STANDALONE -->

<h3>Using without jQuery/Zepto</h3>
Expand Down
34 changes: 29 additions & 5 deletions src/smallworld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,40 @@
},

addMarker: function (point, options) {


// check if 'point' is a group of markers
if (!(point instanceof Array) && typeof(point) !== "number") {
options = options || {};
// make a deep copy
var groupOptions = {};
groupOptions = JSON.parse(JSON.stringify(options));
if (point.markerColor !== undefined) {
groupOptions.markerColor = point.markerColor;
}
if (point.markerSize !== undefined) {
groupOptions.markerSize = point.markerSize;
}
for (var i = 0; i < point.values.length; i++) {
this.pAddMarker(point.values[i], groupOptions);
}
} else {
this.pAddMarker(point, options);
}

},

pAddMarker: function (point, options) {
options = options || {};

var center = this.coordinateToPoint(point[0], point[1]);


var markerSize = options.markerSize || this.options.markerSize;
var markerColor = options.markerColor || this.options.markerColor;

this.context.beginPath();
this.context.arc(center.x, center.y, this.options.markerSize, 0, 2 * Math.PI, false);
this.context.fillStyle = this.options.markerColor;
this.context.arc(center.x, center.y, markerSize, 0, 2 * Math.PI, false);
this.context.fillStyle = markerColor;
this.context.fill();

}

};
Expand Down