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

Rename _ol_geom_GeometryType_ to GeometryType

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 09:00:57 -07:00
parent 2be36c375d
commit 504368369c
29 changed files with 194 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/Feature.js
+2 -2
View File
@@ -4,7 +4,7 @@
import {nullFunction} from '../index.js';
import _ol_array_ from '../array.js';
import {createOrUpdateFromCoordinate, createOrUpdateFromFlatCoordinates, getCenter, getHeight} from '../extent.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import GeometryType from '../geom/GeometryType.js';
import _ol_geom_flat_center_ from '../geom/flat/center.js';
import _ol_geom_flat_interiorpoint_ from '../geom/flat/interiorpoint.js';
import _ol_geom_flat_interpolate_ from '../geom/flat/interpolate.js';
@@ -109,7 +109,7 @@ _ol_render_Feature_.prototype.getEndss = function() {
*/
_ol_render_Feature_.prototype.getExtent = function() {
if (!this.extent_) {
this.extent_ = this.type_ === _ol_geom_GeometryType_.POINT ?
this.extent_ = this.type_ === GeometryType.POINT ?
createOrUpdateFromCoordinate(this.flatCoordinates_) :
createOrUpdateFromFlatCoordinates(
this.flatCoordinates_, 0, this.flatCoordinates_.length, 2);
src/ol/render/canvas/Immediate.js
+9 -9
View File
@@ -9,7 +9,7 @@ import {inherits} from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_colorlike_ from '../../colorlike.js';
import {intersects} from '../../extent.js';
import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../../geom/SimpleGeometry.js';
import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
import _ol_has_ from '../../has.js';
@@ -460,28 +460,28 @@ _ol_render_canvas_Immediate_.prototype.setStyle = function(style) {
_ol_render_canvas_Immediate_.prototype.drawGeometry = function(geometry) {
var type = geometry.getType();
switch (type) {
case _ol_geom_GeometryType_.POINT:
case GeometryType.POINT:
this.drawPoint(/** @type {ol.geom.Point} */ (geometry));
break;
case _ol_geom_GeometryType_.LINE_STRING:
case GeometryType.LINE_STRING:
this.drawLineString(/** @type {ol.geom.LineString} */ (geometry));
break;
case _ol_geom_GeometryType_.POLYGON:
case GeometryType.POLYGON:
this.drawPolygon(/** @type {ol.geom.Polygon} */ (geometry));
break;
case _ol_geom_GeometryType_.MULTI_POINT:
case GeometryType.MULTI_POINT:
this.drawMultiPoint(/** @type {ol.geom.MultiPoint} */ (geometry));
break;
case _ol_geom_GeometryType_.MULTI_LINE_STRING:
case GeometryType.MULTI_LINE_STRING:
this.drawMultiLineString(/** @type {ol.geom.MultiLineString} */ (geometry));
break;
case _ol_geom_GeometryType_.MULTI_POLYGON:
case GeometryType.MULTI_POLYGON:
this.drawMultiPolygon(/** @type {ol.geom.MultiPolygon} */ (geometry));
break;
case _ol_geom_GeometryType_.GEOMETRY_COLLECTION:
case GeometryType.GEOMETRY_COLLECTION:
this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry));
break;
case _ol_geom_GeometryType_.CIRCLE:
case GeometryType.CIRCLE:
this.drawCircle(/** @type {ol.geom.Circle} */ (geometry));
break;
default:
src/ol/render/canvas/Replay.js
+6 -6
View File
@@ -7,7 +7,7 @@ import _ol_colorlike_ from '../../colorlike.js';
import {buffer, clone, coordinateRelationship, createEmpty, createOrUpdate,
createOrUpdateEmpty, extend, extendCoordinate, intersects} from '../../extent.js';
import Relationship from '../../extent/Relationship.js';
import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_geom_flat_inflate_ from '../../geom/flat/inflate.js';
import _ol_geom_flat_length_ from '../../geom/flat/length.js';
import _ol_geom_flat_textpath_ from '../../geom/flat/textpath.js';
@@ -395,7 +395,7 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
var replayBegin = this.coordinates.length;
var flatCoordinates, replayEnd, replayEnds, replayEndss;
var offset;
if (type == _ol_geom_GeometryType_.MULTI_POLYGON) {
if (type == GeometryType.MULTI_POLYGON) {
geometry = /** @type {ol.geom.MultiPolygon} */ (geometry);
flatCoordinates = geometry.getOrientedFlatCoordinates();
replayEndss = [];
@@ -408,9 +408,9 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
}
this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
replayBegin, replayEndss, geometry, renderer, _ol_geom_flat_inflate_.coordinatesss]);
} else if (type == _ol_geom_GeometryType_.POLYGON || type == _ol_geom_GeometryType_.MULTI_LINE_STRING) {
} else if (type == GeometryType.POLYGON || type == GeometryType.MULTI_LINE_STRING) {
replayEnds = [];
flatCoordinates = (type == _ol_geom_GeometryType_.POLYGON) ?
flatCoordinates = (type == GeometryType.POLYGON) ?
/** @type {ol.geom.Polygon} */ (geometry).getOrientedFlatCoordinates() :
geometry.getFlatCoordinates();
offset = this.drawCustomCoordinates_(flatCoordinates, 0,
@@ -418,13 +418,13 @@ _ol_render_canvas_Replay_.prototype.drawCustom = function(geometry, feature, ren
stride, replayEnds);
this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
replayBegin, replayEnds, geometry, renderer, _ol_geom_flat_inflate_.coordinatess]);
} else if (type == _ol_geom_GeometryType_.LINE_STRING || type == _ol_geom_GeometryType_.MULTI_POINT) {
} else if (type == GeometryType.LINE_STRING || type == GeometryType.MULTI_POINT) {
flatCoordinates = geometry.getFlatCoordinates();
replayEnd = this.appendFlatCoordinates(
flatCoordinates, 0, flatCoordinates.length, stride, false, false);
this.instructions.push([_ol_render_canvas_Instruction_.CUSTOM,
replayBegin, replayEnd, geometry, renderer, _ol_geom_flat_inflate_.coordinates]);
} else if (type == _ol_geom_GeometryType_.POINT) {
} else if (type == GeometryType.POINT) {
flatCoordinates = geometry.getFlatCoordinates();
this.coordinates.push(flatCoordinates[0], flatCoordinates[1]);
replayEnd = this.coordinates.length;
src/ol/render/canvas/TextReplay.js
+12 -12
View File
@@ -6,7 +6,7 @@ import _ol_colorlike_ from '../../colorlike.js';
import {createCanvasContext2D} from '../../dom.js';
import {intersects} from '../../extent.js';
import _ol_geom_flat_straightchunk_ from '../../geom/flat/straightchunk.js';
import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_has_ from '../../has.js';
import _ol_render_canvas_ from '../canvas.js';
import _ol_render_canvas_Instruction_ from '../canvas/Instruction.js';
@@ -183,13 +183,13 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
var ends;
flatCoordinates = geometry.getFlatCoordinates();
stride = geometry.getStride();
if (geometryType == _ol_geom_GeometryType_.LINE_STRING) {
if (geometryType == GeometryType.LINE_STRING) {
ends = [flatCoordinates.length];
} else if (geometryType == _ol_geom_GeometryType_.MULTI_LINE_STRING) {
} else if (geometryType == GeometryType.MULTI_LINE_STRING) {
ends = geometry.getEnds();
} else if (geometryType == _ol_geom_GeometryType_.POLYGON) {
} else if (geometryType == GeometryType.POLYGON) {
ends = geometry.getEnds().slice(0, 1);
} else if (geometryType == _ol_geom_GeometryType_.MULTI_POLYGON) {
} else if (geometryType == GeometryType.MULTI_POLYGON) {
var endss = geometry.getEndss();
ends = [];
for (i = 0, ii = endss.length; i < ii; ++i) {
@@ -223,29 +223,29 @@ _ol_render_canvas_TextReplay_.prototype.drawText = function(geometry, feature) {
var label = this.getImage(this.text_, this.textKey_, this.fillKey_, this.strokeKey_);
var width = label.width / this.pixelRatio;
switch (geometryType) {
case _ol_geom_GeometryType_.POINT:
case _ol_geom_GeometryType_.MULTI_POINT:
case GeometryType.POINT:
case GeometryType.MULTI_POINT:
flatCoordinates = geometry.getFlatCoordinates();
end = flatCoordinates.length;
break;
case _ol_geom_GeometryType_.LINE_STRING:
case GeometryType.LINE_STRING:
flatCoordinates = /** @type {ol.geom.LineString} */ (geometry).getFlatMidpoint();
break;
case _ol_geom_GeometryType_.CIRCLE:
case GeometryType.CIRCLE:
flatCoordinates = /** @type {ol.geom.Circle} */ (geometry).getCenter();
break;
case _ol_geom_GeometryType_.MULTI_LINE_STRING:
case GeometryType.MULTI_LINE_STRING:
flatCoordinates = /** @type {ol.geom.MultiLineString} */ (geometry).getFlatMidpoints();
end = flatCoordinates.length;
break;
case _ol_geom_GeometryType_.POLYGON:
case GeometryType.POLYGON:
flatCoordinates = /** @type {ol.geom.Polygon} */ (geometry).getFlatInteriorPoint();
if (!textState.overflow && flatCoordinates[2] / this.resolution < width) {
return;
}
stride = 3;
break;
case _ol_geom_GeometryType_.MULTI_POLYGON:
case GeometryType.MULTI_POLYGON:
var interiorPoints = /** @type {ol.geom.MultiPolygon} */ (geometry).getFlatInteriorPoints();
flatCoordinates = [];
for (i = 0, ii = interiorPoints.length; i < ii; i += 3) {
src/ol/render/webgl/Immediate.js
+9 -9
View File
@@ -3,7 +3,7 @@
*/
import {inherits} from '../../index.js';
import {intersects} from '../../extent.js';
import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_render_ReplayType_ from '../ReplayType.js';
import _ol_render_VectorContext_ from '../VectorContext.js';
import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';
@@ -137,28 +137,28 @@ _ol_render_webgl_Immediate_.prototype.setStyle = function(style) {
_ol_render_webgl_Immediate_.prototype.drawGeometry = function(geometry) {
var type = geometry.getType();
switch (type) {
case _ol_geom_GeometryType_.POINT:
case GeometryType.POINT:
this.drawPoint(/** @type {ol.geom.Point} */ (geometry), null);
break;
case _ol_geom_GeometryType_.LINE_STRING:
case GeometryType.LINE_STRING:
this.drawLineString(/** @type {ol.geom.LineString} */ (geometry), null);
break;
case _ol_geom_GeometryType_.POLYGON:
case GeometryType.POLYGON:
this.drawPolygon(/** @type {ol.geom.Polygon} */ (geometry), null);
break;
case _ol_geom_GeometryType_.MULTI_POINT:
case GeometryType.MULTI_POINT:
this.drawMultiPoint(/** @type {ol.geom.MultiPoint} */ (geometry), null);
break;
case _ol_geom_GeometryType_.MULTI_LINE_STRING:
case GeometryType.MULTI_LINE_STRING:
this.drawMultiLineString(/** @type {ol.geom.MultiLineString} */ (geometry), null);
break;
case _ol_geom_GeometryType_.MULTI_POLYGON:
case GeometryType.MULTI_POLYGON:
this.drawMultiPolygon(/** @type {ol.geom.MultiPolygon} */ (geometry), null);
break;
case _ol_geom_GeometryType_.GEOMETRY_COLLECTION:
case GeometryType.GEOMETRY_COLLECTION:
this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry), null);
break;
case _ol_geom_GeometryType_.CIRCLE:
case GeometryType.CIRCLE:
this.drawCircle(/** @type {ol.geom.Circle} */ (geometry), null);
break;
default:
src/ol/render/webgl/TextReplay.js
+8 -8
View File
@@ -4,7 +4,7 @@
import {getUid, inherits} from '../../index.js';
import _ol_colorlike_ from '../../colorlike.js';
import {createCanvasContext2D} from '../../dom.js';
import _ol_geom_GeometryType_ from '../../geom/GeometryType.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_has_ from '../../has.js';
import _ol_render_replay_ from '../replay.js';
import _ol_render_webgl_ from '../webgl.js';
@@ -127,26 +127,26 @@ _ol_render_webgl_TextReplay_.prototype.drawText = function(geometry, feature) {
var end = 2;
var stride = 2;
switch (geometry.getType()) {
case _ol_geom_GeometryType_.POINT:
case _ol_geom_GeometryType_.MULTI_POINT:
case GeometryType.POINT:
case GeometryType.MULTI_POINT:
flatCoordinates = geometry.getFlatCoordinates();
end = flatCoordinates.length;
stride = geometry.getStride();
break;
case _ol_geom_GeometryType_.CIRCLE:
case GeometryType.CIRCLE:
flatCoordinates = /** @type {ol.geom.Circle} */ (geometry).getCenter();
break;
case _ol_geom_GeometryType_.LINE_STRING:
case GeometryType.LINE_STRING:
flatCoordinates = /** @type {ol.geom.LineString} */ (geometry).getFlatMidpoint();
break;
case _ol_geom_GeometryType_.MULTI_LINE_STRING:
case GeometryType.MULTI_LINE_STRING:
flatCoordinates = /** @type {ol.geom.MultiLineString} */ (geometry).getFlatMidpoints();
end = flatCoordinates.length;
break;
case _ol_geom_GeometryType_.POLYGON:
case GeometryType.POLYGON:
flatCoordinates = /** @type {ol.geom.Polygon} */ (geometry).getFlatInteriorPoint();
break;
case _ol_geom_GeometryType_.MULTI_POLYGON:
case GeometryType.MULTI_POLYGON:
flatCoordinates = /** @type {ol.geom.MultiPolygon} */ (geometry).getFlatInteriorPoints();
end = flatCoordinates.length;
break;