Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Property | Type | Required | Description
`endOffset`| *see below* | No | Minimum offset of the last pattern symbol, from the end point of the line. Default: 0.
`repeat`| *see below* | Yes | Repetition interval of the pattern symbols. Defines the distance between each consecutive symbol's anchor point.
`symbol`| Symbol factory | Yes | Instance of a symbol factory class.
`symbolOffset`| Number | No | Relative pixel offset to apply to symbols, so they don't overlap the path. [PolylineOffset](https://github.com/bbecquet/Leaflet.PolylineOffset) is required in order to use this option

`offset`, `endOffset` and `repeat` can be each defined as a number, in pixels, or in percentage of the line's length, as a string (ex: `'10%'`).

Expand Down
16 changes: 15 additions & 1 deletion leaflet.polylineDecorator.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ L.PolylineDecorator = L.FeatureGroup.extend({
var pattern = {
cache: [],
symbolFactory: patternDef.symbol,
symbolOffset: patternDef.symbolOffset,
isOffsetInPixels: false,
isEndOffsetInPixels: false,
isRepeatInPixels: false
Expand Down Expand Up @@ -349,7 +350,20 @@ L.PolylineDecorator = L.FeatureGroup.extend({
return dirPoints;
}

var offset, endOffset, repeat, pathPixelLength = null, latLngs = this._paths[pathIndex];
var offset, endOffset, repeat, latLngs, pathPixelLength = null;
if (pattern.symbolOffset) {
latLngs = [];
for (var i = 0; i < this._paths[pathIndex].length; i++) {
latLngs[i] = this._map.latLngToLayerPoint(this._paths[pathIndex][i]);
}
latLngs = L.PolylineOffset.offsetPoints(latLngs, pattern.symbolOffset);
for (var i = 0; i < latLngs.length; i++) {
latLngs[i] = this._map.layerPointToLatLng(latLngs[i]);
}
} else {
latLngs = this._paths[pathIndex];
}

if(pattern.isOffsetInPixels) {
pathPixelLength = L.LineUtil.PolylineDecorator.getPixelLength(latLngs, this._map);
offset = pattern.offset/pathPixelLength;
Expand Down
16 changes: 15 additions & 1 deletion src/L.PolylineDecorator.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ L.PolylineDecorator = L.FeatureGroup.extend({
var pattern = {
cache: [],
symbolFactory: patternDef.symbol,
symbolOffset: patternDef.symbolOffset,
isOffsetInPixels: false,
isEndOffsetInPixels: false,
isRepeatInPixels: false
Expand Down Expand Up @@ -181,7 +182,20 @@ L.PolylineDecorator = L.FeatureGroup.extend({
return dirPoints;
}

var offset, endOffset, repeat, pathPixelLength = null, latLngs = this._paths[pathIndex];
var offset, endOffset, repeat, latLngs, pathPixelLength = null;
if (pattern.symbolOffset) {
latLngs = [];
for (var i = 0; i < this._paths[pathIndex].length; i++) {
latLngs[i] = this._map.latLngToLayerPoint(this._paths[pathIndex][i]);
}
latLngs = L.PolylineOffset.offsetPoints(latLngs, pattern.symbolOffset);
for (var i = 0; i < latLngs.length; i++) {
latLngs[i] = this._map.layerPointToLatLng(latLngs[i]);
}
} else {
latLngs = this._paths[pathIndex];
}

if(pattern.isOffsetInPixels) {
pathPixelLength = L.LineUtil.PolylineDecorator.getPixelLength(latLngs, this._map);
offset = pattern.offset/pathPixelLength;
Expand Down