Skip to content

Commit

Permalink
[UPD] Remove old version Openlayers animation #123
Browse files Browse the repository at this point in the history
  • Loading branch information
@Viglino
Viglino committed Jun 20, 2018
1 parent d2e5fc3 commit a1c32af
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 147 deletions.
97 changes: 25 additions & 72 deletions dist/ol-ext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2481,8 +2481,6 @@ ol.control.GeoBookmark.prototype.addBookmark = function(name, position, zoom, pe
released under the CeCILL-B license (French BSD license)
(http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt).
*/
//TODO: replace ol.animation.pan with new {ol.interaction.Interaction.pan}
//
/**
* OpenLayers 3 lobe Overview Control.
* The globe can rotate with map (follow.)
Expand Down Expand Up @@ -2607,30 +2605,11 @@ ol.control.Globe.prototype.setCenter = function (center, show)
{ var map = this.ovmap_;
var p = map.getPixelFromCoordinate(center);
var h = $(this.element).height();
if (map.getView().animate)
{ setTimeout(function()
{ self.pointer_.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}, 800);
map.getView().animate({ center: [center[0],0] });
}
//TODO: Old version (<3.20)
else
{ var pan = ol.animation.pan(
{ duration: 800,
source: map.getView().getCenter()
});
map.beforeRender(function(map, frameState)
{ var b = pan(map, frameState);
if (!b && show!==false)
{ self.pointer_
.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}
return b;
});
map.getView().setCenter([center[0],0]);
}
setTimeout(function() {
self.pointer_.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}, 800);
map.getView().animate({ center: [center[0],0] });
}
};

Expand Down Expand Up @@ -3366,8 +3345,6 @@ ol.control.Overlay.prototype.setClass = function (className)
released under the CeCILL-B license (French BSD license)
(http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt).
*/
//TODO: replace ol.animation.pan with new {ol.interaction.Interaction.pan}
//
/**
* OpenLayers 3 Layer Overview Control.
* The overview can rotate with map.
Expand Down Expand Up @@ -3479,47 +3456,23 @@ ol.control.Overview = function(options)
}
}
// Click on the preview center the map
this.ovmap_.addInteraction (new ol.interaction.Pointer(
{ handleDownEvent: function(evt)
{ //TODO: Old version OL3
if (ol.animation)
{ var pan;
if (options.panAnimation !==false)
{ if (options.panAnimation=="elastic" || options.elasticPan)
{ pan = ol.animation.pan(
{ duration: 1000,
easing: ol.easing.elasticFn(2,0.3),
source: self.getMap().getView().getCenter()
});
}
else
{ pan = ol.animation.pan(
{ duration: 300,
source: self.getMap().getView().getCenter()
});
}
}
self.getMap().beforeRender(pan);
self.getMap().getView().setCenter(evt.coordinate);
}
else
{ if (options.panAnimation !==false)
{ if (options.panAnimation=="elastic" || options.elasticPan)
{ self.getMap().getView().animate(
{ center: evt.coordinate,
easing: ol.easing.elasticFn(2,0.3),
duration: 1000
});
}
else
{ self.getMap().getView().animate(
{ center: evt.coordinate,
duration: 300
});
}
this.ovmap_.addInteraction (new ol.interaction.Pointer({
handleDownEvent: function(evt) {
if (options.panAnimation !==false) {
if (options.panAnimation=="elastic" || options.elasticPan) {
self.getMap().getView().animate({
center: evt.coordinate,
easing: ol.easing.elasticFn(2,0.3),
duration: 1000
});
} else {
self.getMap().getView().animate({
center: evt.coordinate,
duration: 300
});
}
else self.getMap().getView().setCenter(evt.coordinate);
}
else self.getMap().getView().setCenter(evt.coordinate);
return false;
}
}));
Expand All @@ -3530,13 +3483,13 @@ ol.inherits(ol.control.Overview, ol.control.Control);
*/
ol.control.Overview.prototype.getOverviewMap = function()
{ return this.ovmap_;
}
};
/** Toggle overview map
*/
ol.control.Overview.prototype.toggleMap = function()
{ $(this.element).toggleClass("ol-collapsed");
this.ovmap_.updateSize();
}
};
/** Set overview map position
* @param {top|bottom-left|right}
*/
Expand All @@ -3545,7 +3498,7 @@ ol.control.Overview.prototype.setPosition = function(align)
else $(this.element).removeClass("ol-control-top");
if (/right/.test(align)) $(this.element).addClass("ol-control-right");
else $(this.element).removeClass("ol-control-right");
}
};
/**
* Set the map instance the control associated with.
* @param {ol.Map} map The map instance.
Expand Down Expand Up @@ -3593,7 +3546,7 @@ ol.control.Overview.prototype.calcExtent_ = function(extent)
{ f.setGeometry (new ol.geom.Point( center ));
}
source.addFeature(f);
}
};
/**
* @private
*/
Expand Down Expand Up @@ -3629,7 +3582,7 @@ ol.control.Overview.prototype.setView = function(e)
default: break;
}
this.calcExtent_();
}
};

/* Copyright (c) 2015 Jean-Marc VIGLINO,
released under the CeCILL-B license (French BSD license)
Expand Down
2 changes: 1 addition & 1 deletion dist/ol-ext.min.js
View file

Large diffs are not rendered by default.

31 changes: 5 additions & 26 deletions src/control/Globe.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import ol_style_Circle from 'ol/style/circle'
import ol_style_Fill from 'ol/style/fill'
import ol_style_Stroke from 'ol/style/stroke'
import ol_source_Vector from 'ol/source/vector'
//TODO: replace ol.animation.pan with new {ol_interaction_Interaction.pan}
//import ol_interaction_Interaction from 'ol/interaction/interaction'

/**
* OpenLayers 3 lobe Overview Control.
Expand Down Expand Up @@ -161,30 +159,11 @@ ol_control_Globe.prototype.setCenter = function (center, show)
{ var map = this.ovmap_;
var p = map.getPixelFromCoordinate(center);
var h = $(this.element).height();
if (map.getView().animate)
{ setTimeout(function()
{ self.pointer_.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}, 800);
map.getView().animate({ center: [center[0],0] });
}
//TODO: Old version (<3.20)
else
{ var pan = ol.animation.pan(
{ duration: 800,
source: map.getView().getCenter()
});
map.beforeRender(function(map, frameState)
{ var b = pan(map, frameState);
if (!b && show!==false)
{ self.pointer_
.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}
return b;
});
map.getView().setCenter([center[0],0]);
}
setTimeout(function() {
self.pointer_.css({ 'top': Math.min(Math.max(p[1],0),h) , 'left': "50%" } )
.removeClass("hidden");
}, 800);
map.getView().animate({ center: [center[0],0] });
}
};

Expand Down
68 changes: 20 additions & 48 deletions src/control/Overview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ import ol_style_Stroke from 'ol/style/stroke'
import ol_layer_Vector from 'ol/layer/vector'
import ol_Feature from 'ol/feature'

//TODO: replace ol.animation.pan with new {ol_interaction_Interaction.pan}
//import ol_interaction_Interaction from 'ol/interaction/interaction'

/**
* OpenLayers 3 Layer Overview Control.
* The overview can rotate with map.
Expand Down Expand Up @@ -142,48 +139,23 @@ var ol_control_Overview = function(options)
}

// Click on the preview center the map
this.ovmap_.addInteraction (new ol_interaction_Pointer(
{ handleDownEvent: function(evt)
{ //TODO: Old version OL3
if (ol.animation)
{ var pan;
if (options.panAnimation !==false)
{ if (options.panAnimation=="elastic" || options.elasticPan)
{ pan = ol.animation.pan(
{ duration: 1000,
easing: ol_easing.elasticFn(2,0.3),
source: self.getMap().getView().getCenter()
});
}
else
{ pan = ol.animation.pan(
{ duration: 300,
source: self.getMap().getView().getCenter()
});
}

}
self.getMap().beforeRender(pan);
self.getMap().getView().setCenter(evt.coordinate);
}
else
{ if (options.panAnimation !==false)
{ if (options.panAnimation=="elastic" || options.elasticPan)
{ self.getMap().getView().animate(
{ center: evt.coordinate,
easing: ol_easing.elasticFn(2,0.3),
duration: 1000
});
}
else
{ self.getMap().getView().animate(
{ center: evt.coordinate,
duration: 300
});
}
this.ovmap_.addInteraction (new ol_interaction_Pointer({
handleDownEvent: function(evt) {
if (options.panAnimation !==false) {
if (options.panAnimation=="elastic" || options.elasticPan) {
self.getMap().getView().animate({
center: evt.coordinate,
easing: ol_easing.elasticFn(2,0.3),
duration: 1000
});
} else {
self.getMap().getView().animate({
center: evt.coordinate,
duration: 300
});
}
else self.getMap().getView().setCenter(evt.coordinate);
}
else self.getMap().getView().setCenter(evt.coordinate);
return false;
}
}));
Expand All @@ -195,14 +167,14 @@ ol.inherits(ol_control_Overview, ol_control_Control);
*/
ol_control_Overview.prototype.getOverviewMap = function()
{ return this.ovmap_;
}
};

/** Toggle overview map
*/
ol_control_Overview.prototype.toggleMap = function()
{ $(this.element).toggleClass("ol-collapsed");
this.ovmap_.updateSize();
}
};

/** Set overview map position
* @param {top|bottom-left|right}
Expand All @@ -212,7 +184,7 @@ ol_control_Overview.prototype.setPosition = function(align)
else $(this.element).removeClass("ol-control-top");
if (/right/.test(align)) $(this.element).addClass("ol-control-right");
else $(this.element).removeClass("ol-control-right");
}
};

/**
* Set the map instance the control associated with.
Expand Down Expand Up @@ -266,7 +238,7 @@ ol_control_Overview.prototype.calcExtent_ = function(extent)
{ f.setGeometry (new ol_geom_Point( center ));
}
source.addFeature(f);
}
};

/**
* @private
Expand Down Expand Up @@ -303,6 +275,6 @@ ol_control_Overview.prototype.setView = function(e)
default: break;
}
this.calcExtent_();
}
};

export default ol_control_Overview

0 comments on commit a1c32af

Please sign in to comment.