Skip to content
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

Jump to bottom

[fix] Set default value for maxZoom and limit maxZoom option #188 #248

Closed
wants to merge 1 commit into from
Closed

[fix] Set default value for maxZoom and limit maxZoom option #188 #248

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/js/echarts-leaflet/LeafletCoordSys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ function createLeafletCoordSystem(echarts, L) {
LeafletCoordSys.prototype.dimensions = ["lng", "lat"];

LeafletCoordSys.prototype.setZoom = function (zoom) {
if (zoom > 15) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if the maxZoom is higher? Why hardcoding this value here? Can we get the maxZoom here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nemesifier, I think a maximum zoom level of 12-18 is appropriate. If we zoom beyond that, we encounter empty responses from the tile server.
https://wiki.openstreetmap.org/wiki/Zoom_levels
but now I think if it is not an ideal approach could you please give me some Hints/approaches on this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should pass the default config here and get the maxZoom value from it instead of duplicating it here.

zoom = 15;
}
this._zoom = zoom;
};

LeafletCoordSys.prototype.setCenter = function (center) {
this._center = this._projection.project(new L.LatLng(center[1], center[0]));
};
Expand Down
23 changes: 22 additions & 1 deletion lib/js/echarts-leaflet/LeafletModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ export default function extendLeafletModel(echarts) {
},

setCenterAndZoom(center, zoom) {
// Limit zoom level before setting
zoom = Math.min(zoom, this.getMaxZoom());

// If a zoom control exists, adjust its options
const map = this.getLeaflet();
if (map.zoomControl) {
map.zoomControl.options.maxZoom = this.getMaxZoom();
}

this.option.center = center;
this.option.zoom = zoom;
},
Expand All @@ -33,7 +42,10 @@ export default function extendLeafletModel(echarts) {
},

defaultOption: {
mapOptions: {},
mapOptions: {
zoomDelta: 0.25, // Set zoom sensitivity
zoomSnap: 0.3 // Disable zoom snapping
},
tiles: [
{
urlTemplate: "http://{s}.tile.osm.org/{z}/{x}/{y}.png",
Expand All @@ -44,6 +56,15 @@ export default function extendLeafletModel(echarts) {
},
],
layerControl: {},
maxZoom: 15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have 15 here right?

},

/**
* Get the maximum supported zoom level
* @return {number}
*/
getMaxZoom() {
return this.option.maxZoom;
},
});
}
2 changes: 1 addition & 1 deletion src/js/netjsongraph.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ const NetJSONGraphDefaultConfig = {
"http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
options: {
minZoom: 3,
maxZoom: 32,
maxZoom: 15,
attribution: `&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors,
tiles offered by <a href="https://www.mapbox.com">Mapbox</a>`,
},
Expand Down
2 changes: 2 additions & 0 deletions src/js/netjsongraph.render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as echarts from "echarts/lib/echarts";
import {ScatterChart} from "echarts/charts";
import "echarts/lib/chart/graph";
import "echarts/lib/chart/effectScatter";
import "echarts/lib/chart/lines";
Expand Down Expand Up @@ -78,6 +79,7 @@ class NetJSONGraphRender {
configs.echartsOption,
);

echarts.use([ScatterChart]);
echartsLayer.setOption(self.utils.deepMergeObj(commonOption, customOption));
echartsLayer.on(
"click",
Expand Down