[fusion-commits] r2603 - in sandbox/ol212: . lib lib/OpenLayers
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Mon Sep 17 23:22:00 PDT 2012
Author: jng
Date: 2012-09-17 23:21:59 -0700 (Mon, 17 Sep 2012)
New Revision: 2603
Modified:
sandbox/ol212/build.xml
sandbox/ol212/lib/OpenLayers/OpenLayers.js
sandbox/ol212/lib/fusion.js
Log:
Update OpenLayers built with our patched overlay files. Change the script inclusion order so that JxLib loads before OpenLayers so OL doesn't clobber any important globals that JxLib needs. Also remove OLPatch.js from the script list, which from current testing no longer seems to be required.
Modified: sandbox/ol212/build.xml
===================================================================
--- sandbox/ol212/build.xml 2012-09-18 06:08:44 UTC (rev 2602)
+++ sandbox/ol212/build.xml 2012-09-18 06:21:59 UTC (rev 2603)
@@ -207,11 +207,10 @@
<filelist dir="${build.home}/lib"
files=" SingleFile.js
fusion.js
- Proj4js/proj4js-compressed.js
- OpenLayers/OpenLayers.js
- OLpatch.js
jxLib/jxlib.uncompressed.js
+ OpenLayers/OpenLayers.js
IE9patch.js
+ Proj4js/proj4js-compressed.js
Error.js
EventMgr.js
ApplicationDefinition.js
Modified: sandbox/ol212/lib/OpenLayers/OpenLayers.js
===================================================================
--- sandbox/ol212/lib/OpenLayers/OpenLayers.js 2012-09-18 06:08:44 UTC (rev 2602)
+++ sandbox/ol212/lib/OpenLayers/OpenLayers.js 2012-09-18 06:21:59 UTC (rev 2603)
@@ -2588,13 +2588,6 @@
};
/**
- * Maintain existing definition of $.
- */
-if(typeof window.$ === "undefined") {
- window.$ = OpenLayers.Util.getElement;
-}
-
-/**
* Function: removeItem
* Remove an object from an array. Iterates through the array
* to find the item, then removes it.
@@ -47076,376 +47069,6 @@
CLASS_NAME: "OpenLayers.Handler.Feature"
});
/* ======================================================================
- OpenLayers/Control/DragFeature.js
- ====================================================================== */
-
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the 2-clause BSD license.
- * See license.txt in the OpenLayers distribution or repository for the
- * full text of the license. */
-
-
-/**
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Handler/Drag.js
- * @requires OpenLayers/Handler/Feature.js
- */
-
-/**
- * Class: OpenLayers.Control.DragFeature
- * The DragFeature control moves a feature with a drag of the mouse. Create a
- * new control with the <OpenLayers.Control.DragFeature> constructor.
- *
- * Inherits From:
- * - <OpenLayers.Control>
- */
-OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, {
-
- /**
- * APIProperty: geometryTypes
- * {Array(String)} To restrict dragging to a limited set of geometry types,
- * send a list of strings corresponding to the geometry class names.
- */
- geometryTypes: null,
-
- /**
- * APIProperty: onStart
- * {Function} Define this function if you want to know when a drag starts.
- * The function should expect to receive two arguments: the feature
- * that is about to be dragged and the pixel location of the mouse.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that is about to be
- * dragged.
- * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
- */
- onStart: function(feature, pixel) {},
-
- /**
- * APIProperty: onDrag
- * {Function} Define this function if you want to know about each move of a
- * feature. The function should expect to receive two arguments: the
- * feature that is being dragged and the pixel location of the mouse.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
- * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
- */
- onDrag: function(feature, pixel) {},
-
- /**
- * APIProperty: onComplete
- * {Function} Define this function if you want to know when a feature is
- * done dragging. The function should expect to receive two arguments:
- * the feature that is being dragged and the pixel location of the
- * mouse.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
- * pixel - {<OpenLayers.Pixel>} The pixel location of the mouse.
- */
- onComplete: function(feature, pixel) {},
-
- /**
- * APIProperty: onEnter
- * {Function} Define this function if you want to know when the mouse
- * goes over a feature and thereby makes this feature a candidate
- * for dragging.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that is ready
- * to be dragged.
- */
- onEnter: function(feature) {},
-
- /**
- * APIProperty: onLeave
- * {Function} Define this function if you want to know when the mouse
- * goes out of the feature that was dragged.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that was dragged.
- */
- onLeave: function(feature) {},
-
- /**
- * APIProperty: documentDrag
- * {Boolean} If set to true, mouse dragging will continue even if the
- * mouse cursor leaves the map viewport. Default is false.
- */
- documentDrag: false,
-
- /**
- * Property: layer
- * {<OpenLayers.Layer.Vector>}
- */
- layer: null,
-
- /**
- * Property: feature
- * {<OpenLayers.Feature.Vector>}
- */
- feature: null,
-
- /**
- * Property: dragCallbacks
- * {Object} The functions that are sent to the drag handler for callback.
- */
- dragCallbacks: {},
-
- /**
- * Property: featureCallbacks
- * {Object} The functions that are sent to the feature handler for callback.
- */
- featureCallbacks: {},
-
- /**
- * Property: lastPixel
- * {<OpenLayers.Pixel>}
- */
- lastPixel: null,
-
- /**
- * Constructor: OpenLayers.Control.DragFeature
- * Create a new control to drag features.
- *
- * Parameters:
- * layer - {<OpenLayers.Layer.Vector>} The layer containing features to be
- * dragged.
- * options - {Object} Optional object whose properties will be set on the
- * control.
- */
- initialize: function(layer, options) {
- OpenLayers.Control.prototype.initialize.apply(this, [options]);
- this.layer = layer;
- this.handlers = {
- drag: new OpenLayers.Handler.Drag(
- this, OpenLayers.Util.extend({
- down: this.downFeature,
- move: this.moveFeature,
- up: this.upFeature,
- out: this.cancel,
- done: this.doneDragging
- }, this.dragCallbacks), {
- documentDrag: this.documentDrag
- }
- ),
- feature: new OpenLayers.Handler.Feature(
- this, this.layer, OpenLayers.Util.extend({
- // 'click' and 'clickout' callback are for the mobile
- // support: no 'over' or 'out' in touch based browsers.
- click: this.clickFeature,
- clickout: this.clickoutFeature,
- over: this.overFeature,
- out: this.outFeature
- }, this.featureCallbacks),
- {geometryTypes: this.geometryTypes}
- )
- };
- },
-
- /**
- * Method: clickFeature
- * Called when the feature handler detects a click-in on a feature.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>}
- */
- clickFeature: function(feature) {
- if (this.handlers.feature.touch && !this.over && this.overFeature(feature)) {
- this.handlers.drag.dragstart(this.handlers.feature.evt);
- // to let the events propagate to the feature handler (click callback)
- this.handlers.drag.stopDown = false;
- }
- },
-
- /**
- * Method: clickoutFeature
- * Called when the feature handler detects a click-out on a feature.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>}
- */
- clickoutFeature: function(feature) {
- if (this.handlers.feature.touch && this.over) {
- this.outFeature(feature);
- this.handlers.drag.stopDown = true;
- }
- },
-
- /**
- * APIMethod: destroy
- * Take care of things that are not handled in superclass
- */
- destroy: function() {
- this.layer = null;
- OpenLayers.Control.prototype.destroy.apply(this, []);
- },
-
- /**
- * APIMethod: activate
- * Activate the control and the feature handler.
- *
- * Returns:
- * {Boolean} Successfully activated the control and feature handler.
- */
- activate: function() {
- return (this.handlers.feature.activate() &&
- OpenLayers.Control.prototype.activate.apply(this, arguments));
- },
-
- /**
- * APIMethod: deactivate
- * Deactivate the control and all handlers.
- *
- * Returns:
- * {Boolean} Successfully deactivated the control.
- */
- deactivate: function() {
- // the return from the handlers is unimportant in this case
- this.handlers.drag.deactivate();
- this.handlers.feature.deactivate();
- this.feature = null;
- this.dragging = false;
- this.lastPixel = null;
- OpenLayers.Element.removeClass(
- this.map.viewPortDiv, this.displayClass + "Over"
- );
- return OpenLayers.Control.prototype.deactivate.apply(this, arguments);
- },
-
- /**
- * Method: overFeature
- * Called when the feature handler detects a mouse-over on a feature.
- * This activates the drag handler.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The selected feature.
- *
- * Returns:
- * {Boolean} Successfully activated the drag handler.
- */
- overFeature: function(feature) {
- var activated = false;
- if(!this.handlers.drag.dragging) {
- this.feature = feature;
- this.handlers.drag.activate();
- activated = true;
- this.over = true;
- OpenLayers.Element.addClass(this.map.viewPortDiv, this.displayClass + "Over");
- this.onEnter(feature);
- } else {
- if(this.feature.id == feature.id) {
- this.over = true;
- } else {
- this.over = false;
- }
- }
- return activated;
- },
-
- /**
- * Method: downFeature
- * Called when the drag handler detects a mouse-down.
- *
- * Parameters:
- * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
- */
- downFeature: function(pixel) {
- this.lastPixel = pixel;
- this.onStart(this.feature, pixel);
- },
-
- /**
- * Method: moveFeature
- * Called when the drag handler detects a mouse-move. Also calls the
- * optional onDrag method.
- *
- * Parameters:
- * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
- */
- moveFeature: function(pixel) {
- var res = this.map.getResolution();
- this.feature.geometry.move(res * (pixel.x - this.lastPixel.x),
- res * (this.lastPixel.y - pixel.y));
- this.layer.drawFeature(this.feature);
- this.lastPixel = pixel;
- this.onDrag(this.feature, pixel);
- },
-
- /**
- * Method: upFeature
- * Called when the drag handler detects a mouse-up.
- *
- * Parameters:
- * pixel - {<OpenLayers.Pixel>} Location of the mouse event.
- */
- upFeature: function(pixel) {
- if(!this.over) {
- this.handlers.drag.deactivate();
- }
- },
-
- /**
- * Method: doneDragging
- * Called when the drag handler is done dragging.
- *
- * Parameters:
- * pixel - {<OpenLayers.Pixel>} The last event pixel location. If this event
- * came from a mouseout, this may not be in the map viewport.
- */
- doneDragging: function(pixel) {
- this.onComplete(this.feature, pixel);
- },
-
- /**
- * Method: outFeature
- * Called when the feature handler detects a mouse-out on a feature.
- *
- * Parameters:
- * feature - {<OpenLayers.Feature.Vector>} The feature that the mouse left.
- */
- outFeature: function(feature) {
- if(!this.handlers.drag.dragging) {
- this.over = false;
- this.handlers.drag.deactivate();
- OpenLayers.Element.removeClass(
- this.map.viewPortDiv, this.displayClass + "Over"
- );
- this.onLeave(feature);
- this.feature = null;
- } else {
- if(this.feature.id == feature.id) {
- this.over = false;
- }
- }
- },
-
- /**
- * Method: cancel
- * Called when the drag handler detects a mouse-out (from the map viewport).
- */
- cancel: function() {
- this.handlers.drag.deactivate();
- this.over = false;
- },
-
- /**
- * Method: setMap
- * Set the map property for the control and all handlers.
- *
- * Parameters:
- * map - {<OpenLayers.Map>} The control's map.
- */
- setMap: function(map) {
- this.handlers.drag.setMap(map);
- this.handlers.feature.setMap(map);
- OpenLayers.Control.prototype.setMap.apply(this, arguments);
- },
-
- CLASS_NAME: "OpenLayers.Control.DragFeature"
-});
-/* ======================================================================
OpenLayers/Handler/Polygon.js
====================================================================== */
Modified: sandbox/ol212/lib/fusion.js
===================================================================
--- sandbox/ol212/lib/fusion.js 2012-09-18 06:08:44 UTC (rev 2602)
+++ sandbox/ol212/lib/fusion.js 2012-09-18 06:21:59 UTC (rev 2603)
@@ -1490,9 +1490,8 @@
window._FusionLocale = locale;
if (!Fusion._singleFile) {
- var coreScripts = ['lib/OpenLayers/OpenLayers.js',
- 'lib/OLpatch.js',
- 'lib/jxLib/jxlib.uncompressed.js',
+ var coreScripts = [ 'lib/jxLib/jxlib.uncompressed.js', //JxLib has first dibs on any globals
+ 'lib/OpenLayers/OpenLayers.js',
'lib/IE9patch.js',
'lib/Proj4js/proj4js-compressed.js',
'lib/EventMgr.js',
More information about the fusion-commits
mailing list