ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming literals

Browse Source
This commit is contained in:
Tim Schaub
2013-02-19 22:35:29 -07:00
parent 7141721bb1
commit 438664a190
10 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/style/line.js
+10 -10
View File
@@ -1,10 +1,10 @@
goog.provide('ol.style.Line');
goog.provide('ol.style.LiteralLine');
goog.provide('ol.style.LineLiteral');
goog.require('ol.Expression');
goog.require('ol.ExpressionLiteral');
goog.require('ol.style.LiteralSymbolizer');
goog.require('ol.style.Symbolizer');
goog.require('ol.style.SymbolizerLiteral');
/**
@@ -12,16 +12,16 @@ goog.require('ol.style.Symbolizer');
* strokeWidth: (number),
* opacity: (number)}}
*/
ol.style.LiteralLineOptions;
ol.style.LineLiteralOptions;
/**
* @constructor
* @implements {ol.style.LiteralSymbolizer}
* @param {ol.style.LiteralLineOptions} config Symbolizer properties.
* @implements {ol.style.SymbolizerLiteral}
* @param {ol.style.LineLiteralOptions} config Symbolizer properties.
*/
ol.style.LiteralLine = function(config) {
ol.style.LineLiteral = function(config) {
/** @type {string} */
this.strokeStyle = config.strokeStyle;
@@ -83,7 +83,7 @@ ol.style.Line = function(options) {
/**
* @inheritDoc
* @return {ol.style.LiteralLine} Literal line symbolizer.
* @return {ol.style.LineLiteral} Literal line symbolizer.
*/
ol.style.Line.prototype.createLiteral = function(feature) {
var attrs = feature.getAttributes();
@@ -97,7 +97,7 @@ ol.style.Line.prototype.createLiteral = function(feature) {
var opacity = this.opacity_.evaluate(feature, attrs);
goog.asserts.assertNumber(opacity, 'opacity must be a number');
return new ol.style.LiteralLine({
return new ol.style.LineLiteral({
strokeStyle: strokeStyle,
strokeWidth: strokeWidth,
opacity: opacity
@@ -106,9 +106,9 @@ ol.style.Line.prototype.createLiteral = function(feature) {
/**
* @type {ol.style.LiteralLine}
* @type {ol.style.LineLiteral}
*/
ol.style.LineDefaults = new ol.style.LiteralLine({
ol.style.LineDefaults = new ol.style.LineLiteral({
strokeStyle: '#696969',
strokeWidth: 1.5,
opacity: 0.75
src/ol/style/point.js
+4 -4
View File
@@ -1,16 +1,16 @@
goog.provide('ol.style.LiteralPoint');
goog.provide('ol.style.Point');
goog.provide('ol.style.PointLiteral');
goog.require('ol.style.LiteralSymbolizer');
goog.require('ol.style.Symbolizer');
goog.require('ol.style.SymbolizerLiteral');
/**
* @constructor
* @implements {ol.style.LiteralSymbolizer}
* @implements {ol.style.SymbolizerLiteral}
*/
ol.style.LiteralPoint = function() {};
ol.style.PointLiteral = function() {};
src/ol/style/polygon.js
+10 -10
View File
@@ -1,10 +1,10 @@
goog.provide('ol.style.LiteralPolygon');
goog.provide('ol.style.Polygon');
goog.provide('ol.style.PolygonLiteral');
goog.require('ol.Expression');
goog.require('ol.ExpressionLiteral');
goog.require('ol.style.LiteralSymbolizer');
goog.require('ol.style.Symbolizer');
goog.require('ol.style.SymbolizerLiteral');
/**
@@ -13,16 +13,16 @@ goog.require('ol.style.Symbolizer');
* strokeWidth: (number),
* opacity: (number)}}
*/
ol.style.LiteralPolygonOptions;
ol.style.PolygonLiteralOptions;
/**
* @constructor
* @implements {ol.style.LiteralSymbolizer}
* @param {ol.style.LiteralPolygonOptions} config Symbolizer properties.
* @implements {ol.style.SymbolizerLiteral}
* @param {ol.style.PolygonLiteralOptions} config Symbolizer properties.
*/
ol.style.LiteralPolygon = function(config) {
ol.style.PolygonLiteral = function(config) {
/** @type {string} */
this.fillStyle = config.fillStyle;
@@ -97,7 +97,7 @@ ol.style.Polygon = function(options) {
/**
* @inheritDoc
* @return {ol.style.LiteralPolygon} Literal shape symbolizer.
* @return {ol.style.PolygonLiteral} Literal shape symbolizer.
*/
ol.style.Polygon.prototype.createLiteral = function(feature) {
var attrs = feature.getAttributes();
@@ -114,7 +114,7 @@ ol.style.Polygon.prototype.createLiteral = function(feature) {
var opacity = this.opacity_.evaluate(feature, attrs);
goog.asserts.assertNumber(opacity, 'opacity must be a number');
return new ol.style.LiteralPolygon({
return new ol.style.PolygonLiteral({
fillStyle: fillStyle,
strokeStyle: strokeStyle,
strokeWidth: strokeWidth,
@@ -124,9 +124,9 @@ ol.style.Polygon.prototype.createLiteral = function(feature) {
/**
* @type {ol.style.LiteralPolygon}
* @type {ol.style.PolygonLiteral}
*/
ol.style.PolygonDefaults = new ol.style.LiteralPolygon({
ol.style.PolygonDefaults = new ol.style.PolygonLiteral({
fillStyle: '#ffffff',
strokeStyle: '#696969',
strokeWidth: 1.5,
src/ol/style/shape.js
+11 -11
View File
@@ -1,11 +1,11 @@
goog.provide('ol.style.LiteralShape');
goog.provide('ol.style.Shape');
goog.provide('ol.style.ShapeLiteral');
goog.provide('ol.style.ShapeType');
goog.require('ol.Expression');
goog.require('ol.ExpressionLiteral');
goog.require('ol.style.LiteralPoint');
goog.require('ol.style.Point');
goog.require('ol.style.PointLiteral');
/**
@@ -24,16 +24,16 @@ ol.style.ShapeType = {
* strokeWidth: (number),
* opacity: (number)}}
*/
ol.style.LiteralShapeOptions;
ol.style.ShapeLiteralOptions;
/**
* @constructor
* @extends {ol.style.LiteralPoint}
* @param {ol.style.LiteralShapeOptions} config Symbolizer properties.
* @extends {ol.style.PointLiteral}
* @param {ol.style.ShapeLiteralOptions} config Symbolizer properties.
*/
ol.style.LiteralShape = function(config) {
ol.style.ShapeLiteral = function(config) {
/** @type {string} */
this.type = config.type;
@@ -54,7 +54,7 @@ ol.style.LiteralShape = function(config) {
this.opacity = config.opacity;
};
goog.inherits(ol.style.LiteralShape, ol.style.LiteralPoint);
goog.inherits(ol.style.ShapeLiteral, ol.style.PointLiteral);
/**
@@ -133,7 +133,7 @@ ol.style.Shape = function(options) {
/**
* @inheritDoc
* @return {ol.style.LiteralShape} Literal shape symbolizer.
* @return {ol.style.ShapeLiteral} Literal shape symbolizer.
*/
ol.style.Shape.prototype.createLiteral = function(feature) {
var attrs = feature.getAttributes();
@@ -153,7 +153,7 @@ ol.style.Shape.prototype.createLiteral = function(feature) {
var opacity = this.opacity_.evaluate(feature, attrs);
goog.asserts.assertNumber(opacity, 'opacity must be a number');
return new ol.style.LiteralShape({
return new ol.style.ShapeLiteral({
type: this.type_,
size: size,
fillStyle: fillStyle,
@@ -165,9 +165,9 @@ ol.style.Shape.prototype.createLiteral = function(feature) {
/**
* @type {ol.style.LiteralShape}
* @type {ol.style.ShapeLiteral}
*/
ol.style.ShapeDefaults = new ol.style.LiteralShape({
ol.style.ShapeDefaults = new ol.style.ShapeLiteral({
type: ol.style.ShapeType.CIRCLE,
size: 5,
fillStyle: '#ffffff',
src/ol/style/symbolizer.js
+3 -3
View File
@@ -1,5 +1,5 @@
goog.provide('ol.style.LiteralSymbolizer');
goog.provide('ol.style.Symbolizer');
goog.provide('ol.style.SymbolizerLiteral');
goog.require('ol.Feature');
@@ -8,7 +8,7 @@ goog.require('ol.Feature');
/**
* @interface
*/
ol.style.LiteralSymbolizer = function() {};
ol.style.SymbolizerLiteral = function() {};
@@ -20,6 +20,6 @@ ol.style.Symbolizer = function() {};
/**
* @param {ol.Feature} feature Feature for evaluating expressions.
* @return {ol.style.LiteralSymbolizer} Literal symbolizer.
* @return {ol.style.SymbolizerLiteral} Literal symbolizer.
*/
ol.style.Symbolizer.prototype.createLiteral = function(feature) {};