Skip to content

Commit

Permalink
Rename focus to focusbox
Browse files Browse the repository at this point in the history
  • Loading branch information
boldtrn committed Aug 23, 2019
1 parent e0546f8 commit 37b5211
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.2.0 (2019-08-23)

**API Changes**

* The class name `focus` was renamed to `focusbox`. `focus` might be used in many other frameworks and could lead to css conflicts. Please make sure you update the .css when updating the .js! ([#43](https://github.com/GIScience/Leaflet.Heightgraph/pull/64) by [boldtrn](https://github.com/boldtrn)).

0.1.3 (2019-07-17)

**Improvements**
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "leaflet.heightgraph",
"version": "0.1.3",
"version": "0.2.0",
"description": "Leaflet plugin to visualize height information and road attributes",
"main": "src/L.Control.Heightgraph.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/L.Control.Heightgraph.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@
pointer-events: none;
}

.focus {
.focusbox {
display: none;
font-size: 10px;
fill: #000;
pointer-events: none;
}

.focus rect {
.focusbox rect {
fill: rgba(255, 255, 255, 0.8);
stroke-width: 1px;
stroke: #888;
pointer-events: none;
}

.focus text {
.focusbox text {
font-size: 12px;
}

Expand Down
18 changes: 9 additions & 9 deletions src/L.Control.Heightgraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ L.Control.Heightgraph = L.Control.extend({
this._focusLineGroup.remove();
}
this._focus = this._svg.append("g")
.attr("class", "focus");
.attr("class", "focusbox");
// background box
this._focusRect = this._focus.append("rect")
.attr("x", 3)
Expand Down Expand Up @@ -478,8 +478,8 @@ L.Control.Heightgraph = L.Control.extend({
.attr("class", "tspan");
this._typeTspan = this._focusType.append('tspan')
.attr("class", "tspan");
var height = this._dynamicBoxSize('.focus text')[0];
d3.selectAll('.focus rect')
var height = this._dynamicBoxSize('.focusbox text')[0];
d3.selectAll('.focusbox rect')
.attr("height", height * textDistance + (textDistance / 2))
.attr("display", "block");
this._focusLineGroup = this._svg.append("g")
Expand Down Expand Up @@ -657,16 +657,16 @@ L.Control.Heightgraph = L.Control.extend({
.style("fill", "none")
.style("stroke", "none")
.style("pointer-events", "all")
.on("mousemove.focus", this._mousemoveHandler.bind(this))
.on("mouseout.focus", this._mouseoutHandler.bind(this));
.on("mousemove.focusbox", this._mousemoveHandler.bind(this))
.on("mouseout.focusbox", this._mouseoutHandler.bind(this));
if (L.Browser.android) {
background.on("touchstart.drag", this._dragHandler.bind(this))
.on("touchstart.drag", this._dragStartHandler.bind(this))
.on("touchstart.focus", this._mousemoveHandler.bind(this));
.on("touchstart.focusbox", this._mousemoveHandler.bind(this));
L.DomEvent.on(this._container, 'touchend', this._dragEndHandler, this);
} else {
background.on("mousemove.focus", this._mousemoveHandler.bind(this))
.on("mouseout.focus", this._mouseoutHandler.bind(this))
background.on("mousemove.focusbox", this._mousemoveHandler.bind(this))
.on("mouseout.focusbox", this._mouseoutHandler.bind(this))
.on("mousedown.drag", this._dragStartHandler.bind(this))
.on("mousemove.drag", this._dragHandler.bind(this));
L.DomEvent.on(this._container, 'mouseup', this._dragEndHandler, this);
Expand Down Expand Up @@ -962,7 +962,7 @@ L.Control.Heightgraph = L.Control.extend({
ll = item.latlng,
areaIdx = item.areaIdx,
type = item.type;
var boxWidth = this._dynamicBoxSize('.focus text')[1] + 10;
var boxWidth = this._dynamicBoxSize('.focusbox text')[1] + 10;
if (areaIdx === 0) {
areaLength = this._profile.blocks[this._selectedOption].distances[areaIdx];
} else {
Expand Down

0 comments on commit 37b5211

Please sign in to comment.