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

changed the dataset z-index order in the explore map legend window. N… #45

Merged
merged 1 commit into from
Sep 15, 2016
Merged

changed the dataset z-index order in the explore map legend window. N… #45

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
34 changes: 17 additions & 17 deletions app/scripts/components/Explore/ExploreMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ExploreMap extends React.Component {
if (datasets.length) {
datasets.forEach((dataset) => {
if (dataset.layers.length) {
this.updateMapLayer(dataset, layers);
this.updateMapLayer(dataset, layers, datasets.length);
}
});
}
Expand All @@ -106,18 +106,18 @@ class ExploreMap extends React.Component {
return false;
}

updateMapLayer(dataset, layers) {
updateMapLayer(dataset, layers, datasetsLength) {
const layerId = dataset.layers[0].layer_id;
if (dataset.active) {
if (this.isLayerReady(dataset, layers)) {
if (!this.wasAlreadyAdded(dataset)) {
this.hasActiveLayers = true;
const layer = layers[layerId];
this.addMapLayer(dataset, layer);
this.addMapLayer(dataset, layer, datasetsLength);

} else if (this.wasAlreadyAdded(dataset)) {
if (this.hasChangedOrder(dataset)) {
this.changeLayerOrder(dataset);
this.changeLayerOrder(dataset, datasetsLength);
}
if (this.hasChangedOpacity(dataset)) {
this.changeLayerOpacity(dataset);
Expand All @@ -129,18 +129,18 @@ class ExploreMap extends React.Component {
}
}

changeLayerOrder(dataset) {
changeLayerOrder(dataset, datasetsLength) {
const layer = this.mapLayers[dataset.layers[0].layer_id];
if (dataset.index !== undefined && layer) {
if (typeof layer.setZIndex === 'function') {
layer.index = dataset.index;
layer.setZIndex(dataset.index);
layer.setZIndex(datasetsLength - dataset.index);
} else {
const layerId = dataset.layers[0].layer_id;
const layersElements = this.map.getPane('tilePane').children;
for (let i = 0; i < layersElements.length; i++) {
if (layersElements[i].id === layerId) {
layersElements[i].style.zIndex = dataset.index;
layersElements[i].style.zIndex = datasetsLength - dataset.index;
}
}

Expand All @@ -158,21 +158,21 @@ class ExploreMap extends React.Component {
}
}

addMapLayer(dataset, layer) {
addMapLayer(dataset, layer, datasetsLength) {
if (!this.state.loading) {
this.setState({
loading: true
});
}
switch (layer.attributes.provider) {
case 'leaflet':
this.addLeafletLayer(dataset, layer);
this.addLeafletLayer(dataset, layer, datasetsLength);
break;
case 'arcgis':
this.addEsriLayer(dataset, layer);
this.addEsriLayer(dataset, layer, datasetsLength);
break;
case 'cartodb':
this.addCartoLayer(dataset, layer);
this.addCartoLayer(dataset, layer, datasetsLength);
break;
default:
break;
Expand All @@ -184,7 +184,7 @@ class ExploreMap extends React.Component {
* @param {Object} dataset
* @param {Object} layerSpec
*/
addLeafletLayer(dataset, layerSpec) {
addLeafletLayer(dataset, layerSpec, datasetsLength) {
const layerData = layerSpec.attributes['layer-config'];

let layer;
Expand Down Expand Up @@ -218,7 +218,7 @@ class ExploreMap extends React.Component {
layer.on(eventName, () => {
this.handleTileLoaded(layer);
});
layer.addTo(this.map).setZIndex(dataset.index);
layer.addTo(this.map).setZIndex(datasetsLength - dataset.index);
this.mapLayers[layerData.id] = layer;
}
}
Expand All @@ -228,7 +228,7 @@ class ExploreMap extends React.Component {
* @param {Object} dataset
* @param {Object} layerSpec
*/
addEsriLayer(dataset, layerSpec) {
addEsriLayer(dataset, layerSpec, datasetsLength) {
const layer = layerSpec.attributes['layer-config'];
layer.id = layerSpec.id;

Expand All @@ -249,7 +249,7 @@ class ExploreMap extends React.Component {
newLayer.on('load', () => {
this.handleTileLoaded(layer);
const layerElement = this.map.getPane('tilePane').lastChild;
layerElement.style.zIndex = dataset.index;
layerElement.style.zIndex = datasetsLength - dataset.index;
layerElement.id = layer.id;
});
newLayer.addTo(this.map);
Expand All @@ -264,7 +264,7 @@ class ExploreMap extends React.Component {
* @param {Object} dataset
* @param {Object} layerSpec
*/
addCartoLayer(dataset, layerSpec) {
addCartoLayer(dataset, layerSpec, datasetsLength) {
const layer = layerSpec.attributes['layer-config'];
layer.id = layerSpec.id;

Expand Down Expand Up @@ -301,7 +301,7 @@ class ExploreMap extends React.Component {
// we can switch off the layer while it is loading
if (dataset.active) {
const tileUrl = `https://${layer.account}.cartodb.com/api/v1/map/${data.layergroupid}/{z}/{x}/{y}.png`;
this.mapLayers[layer.id] = L.tileLayer(tileUrl).addTo(this.map).setZIndex(dataset.index);
this.mapLayers[layer.id] = L.tileLayer(tileUrl).addTo(this.map).setZIndex(datasetsLength - dataset.index);
this.mapLayers[layer.id].on('load', () => {
this.handleTileLoaded(layer);
});
Expand Down