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

Variable named geometry

Browse Source
This commit is contained in:
Tim Schaub
2016-03-18 16:37:26 -06:00
parent 05cf57dcfc
commit 42f41e1cf4
1 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/canvasimmediate.js
+38 -42
View File
@@ -551,11 +551,10 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
* Render a GeometryCollection to the canvas. Rendering is immediate and * Render a GeometryCollection to the canvas. Rendering is immediate and
* uses the current styles appropriate for each geometry in the collection. * uses the current styles appropriate for each geometry in the collection.
* *
* @param {ol.geom.GeometryCollection} geometryCollectionGeometry Geometry * @param {ol.geom.GeometryCollection} geometry Geometry collection.
* collection.
*/ */
ol.render.canvas.Immediate.prototype.drawGeometryCollection = function(geometryCollectionGeometry) { ol.render.canvas.Immediate.prototype.drawGeometryCollection = function(geometry) {
var geometries = geometryCollectionGeometry.getGeometriesArray(); var geometries = geometry.getGeometriesArray();
var i, ii; var i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) { for (i = 0, ii = geometries.length; i < ii; ++i) {
this.drawGeometry(geometries[i]); this.drawGeometry(geometries[i]);
@@ -567,11 +566,11 @@ ol.render.canvas.Immediate.prototype.drawGeometryCollection = function(geometryC
* Render a Point geometry into the canvas. Rendering is immediate and uses * Render a Point geometry into the canvas. Rendering is immediate and uses
* the current style. * the current style.
* *
* @param {ol.geom.Point|ol.render.Feature} pointGeometry Point geometry. * @param {ol.geom.Point|ol.render.Feature} geometry Point geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawPoint = function(pointGeometry) { ol.render.canvas.Immediate.prototype.drawPoint = function(geometry) {
var flatCoordinates = pointGeometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var stride = pointGeometry.getStride(); var stride = geometry.getStride();
if (this.image_) { if (this.image_) {
this.drawImages_(flatCoordinates, 0, flatCoordinates.length, stride); this.drawImages_(flatCoordinates, 0, flatCoordinates.length, stride);
} }
@@ -585,12 +584,11 @@ ol.render.canvas.Immediate.prototype.drawPoint = function(pointGeometry) {
* Render a MultiPoint geometry into the canvas. Rendering is immediate and * Render a MultiPoint geometry into the canvas. Rendering is immediate and
* uses the current style. * uses the current style.
* *
* @param {ol.geom.MultiPoint|ol.render.Feature} multiPointGeometry MultiPoint * @param {ol.geom.MultiPoint|ol.render.Feature} geometry MultiPoint geometry.
* geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawMultiPoint = function(multiPointGeometry) { ol.render.canvas.Immediate.prototype.drawMultiPoint = function(geometry) {
var flatCoordinates = multiPointGeometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var stride = multiPointGeometry.getStride(); var stride = geometry.getStride();
if (this.image_) { if (this.image_) {
this.drawImages_(flatCoordinates, 0, flatCoordinates.length, stride); this.drawImages_(flatCoordinates, 0, flatCoordinates.length, stride);
} }
@@ -604,24 +602,23 @@ ol.render.canvas.Immediate.prototype.drawMultiPoint = function(multiPointGeometr
* Render a LineString into the canvas. Rendering is immediate and uses * Render a LineString into the canvas. Rendering is immediate and uses
* the current style. * the current style.
* *
* @param {ol.geom.LineString|ol.render.Feature} lineStringGeometry Line * @param {ol.geom.LineString|ol.render.Feature} geometry LineString geometry.
* string geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawLineString = function(lineStringGeometry) { ol.render.canvas.Immediate.prototype.drawLineString = function(geometry) {
if (!ol.extent.intersects(this.extent_, lineStringGeometry.getExtent())) { if (!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return; return;
} }
if (this.strokeState_) { if (this.strokeState_) {
this.setContextStrokeState_(this.strokeState_); this.setContextStrokeState_(this.strokeState_);
var context = this.context_; var context = this.context_;
var flatCoordinates = lineStringGeometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
context.beginPath(); context.beginPath();
this.moveToLineTo_(flatCoordinates, 0, flatCoordinates.length, this.moveToLineTo_(flatCoordinates, 0, flatCoordinates.length,
lineStringGeometry.getStride(), false); geometry.getStride(), false);
context.stroke(); context.stroke();
} }
if (this.text_ !== '') { if (this.text_ !== '') {
var flatMidpoint = lineStringGeometry.getFlatMidpoint(); var flatMidpoint = geometry.getFlatMidpoint();
this.drawText_(flatMidpoint, 0, 2, 2); this.drawText_(flatMidpoint, 0, 2, 2);
} }
}; };
@@ -631,21 +628,21 @@ ol.render.canvas.Immediate.prototype.drawLineString = function(lineStringGeometr
* Render a MultiLineString geometry into the canvas. Rendering is immediate * Render a MultiLineString geometry into the canvas. Rendering is immediate
* and uses the current style. * and uses the current style.
* *
* @param {ol.geom.MultiLineString|ol.render.Feature} multiLineStringGeometry * @param {ol.geom.MultiLineString|ol.render.Feature} geometry MultiLineString
* MultiLineString geometry. * geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawMultiLineString = function(multiLineStringGeometry) { ol.render.canvas.Immediate.prototype.drawMultiLineString = function(geometry) {
var geometryExtent = multiLineStringGeometry.getExtent(); var geometryExtent = geometry.getExtent();
if (!ol.extent.intersects(this.extent_, geometryExtent)) { if (!ol.extent.intersects(this.extent_, geometryExtent)) {
return; return;
} }
if (this.strokeState_) { if (this.strokeState_) {
this.setContextStrokeState_(this.strokeState_); this.setContextStrokeState_(this.strokeState_);
var context = this.context_; var context = this.context_;
var flatCoordinates = multiLineStringGeometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var offset = 0; var offset = 0;
var ends = multiLineStringGeometry.getEnds(); var ends = geometry.getEnds();
var stride = multiLineStringGeometry.getStride(); var stride = geometry.getStride();
context.beginPath(); context.beginPath();
var i, ii; var i, ii;
for (i = 0, ii = ends.length; i < ii; ++i) { for (i = 0, ii = ends.length; i < ii; ++i) {
@@ -655,7 +652,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineString = function(multiLineStr
context.stroke(); context.stroke();
} }
if (this.text_ !== '') { if (this.text_ !== '') {
var flatMidpoints = multiLineStringGeometry.getFlatMidpoints(); var flatMidpoints = geometry.getFlatMidpoints();
this.drawText_(flatMidpoints, 0, flatMidpoints.length, 2); this.drawText_(flatMidpoints, 0, flatMidpoints.length, 2);
} }
}; };
@@ -665,11 +662,10 @@ ol.render.canvas.Immediate.prototype.drawMultiLineString = function(multiLineStr
* Render a Polygon geometry into the canvas. Rendering is immediate and uses * Render a Polygon geometry into the canvas. Rendering is immediate and uses
* the current style. * the current style.
* *
* @param {ol.geom.Polygon|ol.render.Feature} polygonGeometry Polygon * @param {ol.geom.Polygon|ol.render.Feature} geometry Polygon geometry.
* geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawPolygon = function(polygonGeometry) { ol.render.canvas.Immediate.prototype.drawPolygon = function(geometry) {
if (!ol.extent.intersects(this.extent_, polygonGeometry.getExtent())) { if (!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return; return;
} }
if (this.strokeState_ || this.fillState_) { if (this.strokeState_ || this.fillState_) {
@@ -681,8 +677,8 @@ ol.render.canvas.Immediate.prototype.drawPolygon = function(polygonGeometry) {
} }
var context = this.context_; var context = this.context_;
context.beginPath(); context.beginPath();
this.drawRings_(polygonGeometry.getOrientedFlatCoordinates(), this.drawRings_(geometry.getOrientedFlatCoordinates(),
0, polygonGeometry.getEnds(), polygonGeometry.getStride()); 0, geometry.getEnds(), geometry.getStride());
if (this.fillState_) { if (this.fillState_) {
context.fill(); context.fill();
} }
@@ -691,7 +687,7 @@ ol.render.canvas.Immediate.prototype.drawPolygon = function(polygonGeometry) {
} }
} }
if (this.text_ !== '') { if (this.text_ !== '') {
var flatInteriorPoint = polygonGeometry.getFlatInteriorPoint(); var flatInteriorPoint = geometry.getFlatInteriorPoint();
this.drawText_(flatInteriorPoint, 0, 2, 2); this.drawText_(flatInteriorPoint, 0, 2, 2);
} }
}; };
@@ -700,10 +696,10 @@ ol.render.canvas.Immediate.prototype.drawPolygon = function(polygonGeometry) {
/** /**
* Render MultiPolygon geometry into the canvas. Rendering is immediate and * Render MultiPolygon geometry into the canvas. Rendering is immediate and
* uses the current style. * uses the current style.
* @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry. * @param {ol.geom.MultiPolygon} geometry MultiPolygon geometry.
*/ */
ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(multiPolygonGeometry) { ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(geometry) {
if (!ol.extent.intersects(this.extent_, multiPolygonGeometry.getExtent())) { if (!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return; return;
} }
if (this.strokeState_ || this.fillState_) { if (this.strokeState_ || this.fillState_) {
@@ -714,10 +710,10 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(multiPolygonGeo
this.setContextStrokeState_(this.strokeState_); this.setContextStrokeState_(this.strokeState_);
} }
var context = this.context_; var context = this.context_;
var flatCoordinates = multiPolygonGeometry.getOrientedFlatCoordinates(); var flatCoordinates = geometry.getOrientedFlatCoordinates();
var offset = 0; var offset = 0;
var endss = multiPolygonGeometry.getEndss(); var endss = geometry.getEndss();
var stride = multiPolygonGeometry.getStride(); var stride = geometry.getStride();
var i, ii; var i, ii;
for (i = 0, ii = endss.length; i < ii; ++i) { for (i = 0, ii = endss.length; i < ii; ++i) {
var ends = endss[i]; var ends = endss[i];
@@ -732,7 +728,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(multiPolygonGeo
} }
} }
if (this.text_ !== '') { if (this.text_ !== '') {
var flatInteriorPoints = multiPolygonGeometry.getFlatInteriorPoints(); var flatInteriorPoints = geometry.getFlatInteriorPoints();
this.drawText_(flatInteriorPoints, 0, flatInteriorPoints.length, 2); this.drawText_(flatInteriorPoints, 0, flatInteriorPoints.length, 2);
} }
}; };