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.

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

Remove rows of slashes. #713

Merged
merged 1 commit into from
Jun 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions examples/dynamicData/clock.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//////////////////////////////////////////////////////////////////////////////
/**
* Stores the current time for a map, triggers time keeping events, and
* handles the animation state and interaction.
Expand All @@ -7,7 +6,6 @@
* @extends geo.object
* @returns {geo.clock}
*/
//////////////////////////////////////////////////////////////////////////////
geo.clock = function (opts) {
'use strict';

Expand All @@ -17,11 +15,9 @@ geo.clock = function (opts) {
geo.object.call(this, opts);
opts = opts || {};

//////////////////////////////////////////////////////////////////////////////
/**
* @private
*/
//////////////////////////////////////////////////////////////////////////////
var m_this = this,
m_now = new Date(0),
m_start = null,
Expand All @@ -34,11 +30,9 @@ geo.clock = function (opts) {
m_currentAnimation = null,
m_object = null;

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the geo.object to trigger events on.
*/
//////////////////////////////////////////////////////////////////////////////
this.object = function (arg) {
if (arg === undefined) {
return m_object;
Expand All @@ -47,21 +41,17 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Returns true if attached to a valid geo.object.
* @private
*/
//////////////////////////////////////////////////////////////////////////////
this._attached = function () {
return (m_object instanceof geo.object);
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the current time.
*/
//////////////////////////////////////////////////////////////////////////////
this.now = function (arg) {
var previous = m_now;
if (arg === undefined) {
Expand All @@ -80,11 +70,9 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the animation start time.
*/
//////////////////////////////////////////////////////////////////////////////
this.start = function (arg) {
if (arg === undefined) {
return m_start;
Expand All @@ -93,11 +81,9 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the animation end time.
*/
//////////////////////////////////////////////////////////////////////////////
this.end = function (arg) {
if (arg === undefined) {
return m_end;
Expand All @@ -106,11 +92,9 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the animation time step.
*/
//////////////////////////////////////////////////////////////////////////////
this.step = function (arg) {
if (arg === undefined) {
return m_step;
Expand All @@ -119,13 +103,11 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set looping control of the clock. This controls how many times the
* animation will repeat before stopping. Default
* ``Number.POSITIVE_INFINITY``, the animation repeats forever.
*/
//////////////////////////////////////////////////////////////////////////////
this.loop = function (arg) {
if (arg === undefined) {
return m_loop;
Expand All @@ -134,7 +116,6 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the animation state. Valid values are:
*
Expand All @@ -145,7 +126,6 @@ geo.clock = function (opts) {
* This will also trigger relevant events, but they may be fired
* asynchronously.
*/
//////////////////////////////////////////////////////////////////////////////
this.state = function (arg, step) {

if (arg === undefined) {
Expand All @@ -172,13 +152,11 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Get or set the animation frame rate. This is approximately the number
* of frames displayed per second. A null value will use the browser's
* native requestAnimationFrame to draw new frames.
*/
//////////////////////////////////////////////////////////////////////////////
this.framerate = function (arg) {
if (arg === undefined) {
return m_rate;
Expand All @@ -187,37 +165,31 @@ geo.clock = function (opts) {
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Step to the next frame in the animation. Pauses the animation if it is
* playing.
*/
//////////////////////////////////////////////////////////////////////////////
this.stepForward = function () {
m_this.state('pause');
m_this._setNextFrame(1);
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Step to the previous frame in the animation. Pauses the animation if it is
* playing.
*/
//////////////////////////////////////////////////////////////////////////////
this.stepBackward = function () {
m_this.state('pause');
m_this._setNextFrame(-1);
return m_this;
};

//////////////////////////////////////////////////////////////////////////////
/**
* Step to the next frame in the animation. Will set the state to stop
* if the animation has reached the end and there are no more loops.
* @private
*/
//////////////////////////////////////////////////////////////////////////////
this._setNextFrame = function (step) {
var next = new Date(m_this.now().valueOf() + step * m_this.step());

Expand All @@ -237,14 +209,12 @@ geo.clock = function (opts) {
m_this.now(next);
};

//////////////////////////////////////////////////////////////////////////////
/**
* Start an animation.
* @param {integer} step The animation frame step (+1 for forward -1 for
* reverse, etc).
* @private
*/
//////////////////////////////////////////////////////////////////////////////
this._animate = function (step) {
var myAnimation = {};
m_currentAnimation = myAnimation;
Expand Down
2 changes: 0 additions & 2 deletions src/action.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
//////////////////////////////////////////////////////////////////////////////
/**
* Common object containing all action types that are provided by the GeoJS
* API.
*/
//////////////////////////////////////////////////////////////////////////////
var geo_action = {
momentum: 'geo_action_momentum',
pan: 'geo_action_pan',
Expand Down
10 changes: 0 additions & 10 deletions src/annotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var annotationState = {

var annotationActionOwner = 'annotationAction';

/////////////////////////////////////////////////////////////////////////////
/**
* Base annotation class
*
Expand All @@ -35,7 +34,6 @@ var annotationActionOwner = 'annotationAction';
* annotation.state values.
* @returns {geo.annotation}
*/
/////////////////////////////////////////////////////////////////////////////
var annotation = function (type, args) {
'use strict';
if (!(this instanceof annotation)) {
Expand Down Expand Up @@ -422,7 +420,6 @@ var annotation = function (type, args) {
};
};

/////////////////////////////////////////////////////////////////////////////
/**
* Rectangle annotation class
*
Expand All @@ -437,7 +434,6 @@ var annotation = function (type, args) {
* fill, fillColor, fillOpacity, stroke, strokeWidth, strokeColor,
* strokeOpacity
*/
/////////////////////////////////////////////////////////////////////////////
var rectangleAnnotation = function (args) {
'use strict';
if (!(this instanceof rectangleAnnotation)) {
Expand Down Expand Up @@ -694,7 +690,6 @@ var rectangleRequiredFeatures = {};
rectangleRequiredFeatures[polygonFeature.capabilities.feature] = true;
registerAnnotation('rectangle', rectangleAnnotation, rectangleRequiredFeatures);

/////////////////////////////////////////////////////////////////////////////
/**
* Polygon annotation class
*
Expand All @@ -711,7 +706,6 @@ registerAnnotation('rectangle', rectangleAnnotation, rectangleRequiredFeatures);
* fill, fillColor, fillOpacity, stroke, strokeWidth, strokeColor,
* strokeOpacity
*/
/////////////////////////////////////////////////////////////////////////////
var polygonAnnotation = function (args) {
'use strict';
if (!(this instanceof polygonAnnotation)) {
Expand Down Expand Up @@ -941,7 +935,6 @@ polygonRequiredFeatures[polygonFeature.capabilities.feature] = true;
polygonRequiredFeatures[lineFeature.capabilities.basic] = [annotationState.create];
registerAnnotation('polygon', polygonAnnotation, polygonRequiredFeatures);

/////////////////////////////////////////////////////////////////////////////
/**
* Line annotation class
*
Expand All @@ -955,7 +948,6 @@ registerAnnotation('polygon', polygonAnnotation, polygonRequiredFeatures);
* strokeWidth, strokeColor, strokeOpacity, strokeOffset, closed, lineCap,
* lineJoin
*/
/////////////////////////////////////////////////////////////////////////////
var lineAnnotation = function (args) {
'use strict';
if (!(this instanceof lineAnnotation)) {
Expand Down Expand Up @@ -1236,7 +1228,6 @@ var lineRequiredFeatures = {};
lineRequiredFeatures[lineFeature.capabilities.basic] = [annotationState.create];
registerAnnotation('line', lineAnnotation, lineRequiredFeatures);

/////////////////////////////////////////////////////////////////////////////
/**
* Point annotation class
*
Expand All @@ -1251,7 +1242,6 @@ registerAnnotation('line', lineAnnotation, lineRequiredFeatures);
* the radius is based on the zoom level at first instantiation. Otherwise, if
* it is a number, the radius is used at that zoom level.
*/
/////////////////////////////////////////////////////////////////////////////
var pointAnnotation = function (args) {
'use strict';
if (!(this instanceof pointAnnotation)) {
Expand Down
12 changes: 2 additions & 10 deletions src/annotationLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ var transform = require('./transform');
var $ = require('jquery');
var Mousetrap = require('mousetrap');

/////////////////////////////////////////////////////////////////////////////
/**
* Layer to handle direct interactions with different features. Annotations
* (features) can be created by calling mode(<name of feature>) or cancelled
Expand All @@ -28,7 +27,6 @@ var Mousetrap = require('mousetrap');
* start point.
* @returns {geo.annotationLayer}
*/
/////////////////////////////////////////////////////////////////////////////
var annotationLayer = function (args) {
'use strict';
if (!(this instanceof annotationLayer)) {
Expand Down Expand Up @@ -629,11 +627,9 @@ var annotationLayer = function (args) {
return value;
};

///////////////////////////////////////////////////////////////////////////
/**
* Update layer
*/
///////////////////////////////////////////////////////////////////////////
this._update = function (request) {
if (m_this.getMTime() > m_buildTime.getMTime()) {
/* Interally, we have a set of feature levels (to provide z-index
Expand Down Expand Up @@ -741,13 +737,11 @@ var annotationLayer = function (args) {
}
};

///////////////////////////////////////////////////////////////////////////
/**
* Initialize
*/
///////////////////////////////////////////////////////////////////////////
this._init = function () {
/// Call super class init
// Call super class init
s_init.call(m_this);

if (!m_this.map().interactor()) {
Expand All @@ -764,13 +758,11 @@ var annotationLayer = function (args) {
return m_this;
};

///////////////////////////////////////////////////////////////////////////
/**
* Free all resources
*/
///////////////////////////////////////////////////////////////////////////
this._exit = function () {
/// Call super class exit
// Call super class exit
s_exit.call(m_this);
m_annotations = [];
m_features = [];
Expand Down
2 changes: 0 additions & 2 deletions src/camera.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
var mat4 = require('gl-mat4');
var vec4 = require('gl-vec4');

//////////////////////////////////////////////////////////////////////////////
/**
* This class defines the raw interface for a camera. At a low level, the
* camera provides a methods for converting between a map's coordinate system
Expand Down Expand Up @@ -51,7 +50,6 @@
* @param {object} spec.viewport.height
* @returns {geo.camera}
*/
//////////////////////////////////////////////////////////////////////////////
var camera = function (spec) {
if (!(this instanceof camera)) {
return new camera(spec);
Expand Down
Loading