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

add MiniMap #35

Open
wants to merge 1 commit into
base: Saijin-Naib_Modules
Choose a base branch
from
Open

add MiniMap #35

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
69 changes: 45 additions & 24 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,37 @@ $(function(){
$("#btnChangeComparison").text("Switch to slider comparison");
// get center and zoom of sideBySide map and set sync map to it
syncMap1.setView(sideBySideMap.getCenter(), sideBySideMap.getZoom());
updateLayers();
updateLayers();
}else{
$("#btnChangeComparison").attr("data-comparison", "sideBySide");
$("#btnChangeComparison").text("Switch to synced comparison");
// get center and zoom of sync map and set sideBySide map to it
sideBySideMap.setView(syncMap1.getCenter(), syncMap1.getZoom());
updateLayers();
}
});
}
});

// Create and add an OSM reference layer to each map
// (we cannot create just one L.tileLayer and initiate all 3 maps with it)
var osmTileUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmTileConfig = {
minZoom: 0,
maxZoom: 99,
maxNativeZoom: 19,
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}
L.tileLayer(osmTileUrl, osmTileConfig).addTo(sideBySideMap);
L.tileLayer(osmTileUrl, osmTileConfig).addTo(syncMap1);
L.tileLayer(osmTileUrl, osmTileConfig).addTo(syncMap2);


// Initiate the mini maps
// (docs say "don't reuse the layer you added to the main map")
var sideMiniLayerGroup = L.layerGroup( [L.tileLayer(osmTileUrl, osmTileConfig)] );
var sideMiniMap = new L.Control.MiniMap(sideMiniLayerGroup, {zoomLevelOffset: -5}).addTo(sideBySideMap);
var syncMiniLayerGroup = L.layerGroup( [L.tileLayer(osmTileUrl, osmTileConfig)] );
var syncMiniMap = new L.Control.MiniMap(syncMiniLayerGroup, {zoomLevelOffset: -5}).addTo(syncMap2);


// Sync the two synced maps per https://github.com/jieter/Leaflet.Sync
syncMap1.sync(syncMap2);
syncMap2.sync(syncMap1);
Expand All @@ -121,11 +130,11 @@ $(function(){
$dataset.on('change', function(e){
updateLayers("dataset");
});

for (var i in datasets){
var d = datasets[i];
var $opt = $('<option value="' + d.id + '">' + d.label + '</option>');

$dataset.append($opt);
}

Expand Down Expand Up @@ -162,12 +171,12 @@ $(function(){
updateLayers();
}
});

for (var i in engines){
var e = engines[i];
var $opt = $('<option value="' + e.id + '"' + (e.rightStart ? 'selected' : '') + '>' + e.label + '</option>');
$rightEngine.append($opt);

$opt = $('<option value="' + e.id + '"' + (e.leftStart ? 'selected' : '') + '>' + e.label + '</option>');
$leftEngine.append($opt);
}
Expand All @@ -177,7 +186,7 @@ $(function(){
updateLayers();
});

var leftLayer, rightLayer;
var leftLayer, rightLayer, miniLayer;
var prefix = "https://opendronemap.github.io/UAVArena-data/";

var layerConfig = {
Expand All @@ -187,22 +196,30 @@ $(function(){
tms: true
}
var sideBySide = L.control.sideBySide([], []).addTo(sideBySideMap);

var cleanLayers = function(){
if(leftLayer){
if (sideBySideMap.hasLayer(leftLayer)) sideBySideMap.removeLayer(leftLayer);
if (syncMap1.hasLayer(leftLayer)) syncMap1.removeLayer(leftLayer);
}
if(rightLayer){
if (sideBySideMap.hasLayer(rightLayer)) sideBySideMap.removeLayer(rightLayer);
if (sideMiniLayerGroup.hasLayer(miniLayer)) sideMiniLayerGroup.removeLayer(miniLayer);
if (syncMap2.hasLayer(rightLayer)) syncMap2.removeLayer(rightLayer);
}
if (syncMiniLayerGroup.hasLayer(miniLayer)) syncMiniLayerGroup.removeLayer(miniLayer);
}
}

var updateSideBySideLayers = function(){
leftLayer = L.tileLayer(prefix + 'data/' + $leftEngine.val() +'/' +

var updateSideBySideLayers = function(){
leftLayer = L.tileLayer(prefix + 'data/' + $leftEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);
rightLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);
rightLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
// to keep things cleaner, we only use the right layer
// and only show the minimap on the right side map
// presumably they will have approx the same extent and
// the differences not apparent at mini map size
miniLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);

if (leftLayer){
Expand All @@ -215,26 +232,30 @@ $(function(){
if (rightLayer){
rightLayer.addTo(sideBySideMap);
sideBySide.setRightLayers([rightLayer]);
miniLayer.addTo(sideMiniLayerGroup);
}else{
sideBySide.setRightLayers([]);
}
};

var updateSyncLayers = function(){
leftLayer = L.tileLayer(prefix + 'data/' + $leftEngine.val() +'/' +
leftLayer = L.tileLayer(prefix + 'data/' + $leftEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);
rightLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);
rightLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
miniLayer = L.tileLayer(prefix + 'data/' + $rightEngine.val() +'/' +
$dataset.val() + '/' + $product.val() + '/tiles/{z}/{x}/{y}.webp', layerConfig);

if (leftLayer) leftLayer.addTo(syncMap1);
if (rightLayer) rightLayer.addTo(syncMap2);
if (miniLayer) miniLayer.addTo(syncMiniLayerGroup);
};

var updateLayers = function(updateType){
cleanLayers();
// Center the map on the dataset *if* the dataset changes,
// Center the map on the dataset *if* the dataset changes,
// because then we're jumping to a different location
if(updateType === "dataset"){
if(updateType === "dataset"){
for (var k in datasets){
if (datasets[k].id === $dataset.val()){
syncMap1.panTo(datasets[k].center);
Expand All @@ -243,7 +264,7 @@ $(function(){
}
}
}

// show hide the maps according to which comparison is active
var comparisonType = $("#btnChangeComparison").attr("data-comparison");
if (comparisonType === "sideBySide"){
Expand All @@ -261,4 +282,4 @@ $(function(){

updateLayers();

});
});