Skip to content

Added dragging toggle #50

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 3 commits into from
Feb 5, 2020
Merged

Added dragging toggle #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cabf1ee
added dragging toggle
gdunstone Feb 5, 2020
798c814
added option to disable double click zoom as well
gdunstone Feb 5, 2020
fbef7ca
forgot to call setter on init
gdunstone Feb 5, 2020
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
5 changes: 4 additions & 1 deletion src/partials/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,10 @@ <h5>Appearance</h5>
<gf-form-switch class="gf-form" label="Show Zoom Control" label-class="width-10" checked="ctrl.panel.showZoomControl" on-change="ctrl.restart()"></gf-form-switch>
<gf-form-switch class="gf-form" label="Mouse Wheel Zoom" label-class="width-10" checked="ctrl.panel.mouseWheelZoom" on-change="ctrl.toggleMouseWheelZoom()"></gf-form-switch>
</div>

<gf-form-switch class="gf-form" label="Dragging" label-class="width-10" checked="ctrl.panel.dragging" on-change="ctrl.toggleDragging()"></gf-form-switch>
</div>
<gf-form-switch class="gf-form" label="Double Click Zoom" label-class="width-10" checked="ctrl.panel.doubleClickZoom" on-change="ctrl.toggleDoubleClickZoom()"></gf-form-switch>
</div>
<!-- Legend -->
<div class="gf-form-subgroup">
<gf-form-switch class="gf-form" label="Show Legend" label-class="width-10" checked="ctrl.panel.showLegend" on-change="ctrl.toggleLegend()"></gf-form-switch>
Expand Down
18 changes: 18 additions & 0 deletions src/worldmap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export default class WorldMap {
attributionControl: this.ctrl.settings.showAttribution,
});
this.setMouseWheelZoom();
this.setDragging();
this.setDoubleClickZoom();

const selectedTileServer = tileServers[this.ctrl.tileServer];
(window as any).L.tileLayer(selectedTileServer.url, {
Expand Down Expand Up @@ -445,6 +447,22 @@ export default class WorldMap {
}
}

setDragging() {
if (!this.ctrl.settings.dragging) {
this.map.dragging.disable();
} else {
this.map.dragging.enable();
}
}

setDoubleClickZoom() {
if (!this.ctrl.settings.doubleClickZoom) {
this.map.doubleClickZoom.disable();
} else {
this.map.doubleClickZoom.enable();
}
}

addCircles(circles) {
// Todo: Optionally add fixed custom attributions to the circle layer.
const attribution = undefined;
Expand Down
12 changes: 12 additions & 0 deletions src/worldmap_ctrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ const panelDefaults = {
customAttribution: false,
customAttributionText: null,
mouseWheelZoom: false,
dragging: true,
doubleClickZoom: true,
esGeoPoint: null,
// Todo: Investigate: Is "Count" a reasonable default here
// or does it confuse the operator?
Expand Down Expand Up @@ -504,6 +506,16 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
this.render();
}

toggleDragging() {
this.map.setDragging();
this.render();
}

toggleDoubleClickZoom() {
this.map.setDoubleClickZoom();
this.render();
}

toggleCustomAttribution() {
if (this.settings.customAttribution) {
const attributionControl = this.map.map.attributionControl;
Expand Down