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

Simplify hit detection code

Browse Source
This commit is contained in:
Éric Lemoine
2014-12-05 15:42:54 +01:00
parent 571cd1c57a
commit fdf52c1865
12 changed files with 142 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/ol/render/vector.js
View File

@@ -49,11 +49,11 @@ ol.renderer.vector.getTolerance = function(resolution, pixelRatio) {
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderCircleGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.Circle);
var fillStyle = style.getFill();
var strokeStyle = style.getStroke();
@@ -61,14 +61,14 @@ ol.renderer.vector.renderCircleGeometry_ =
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawCircleGeometry(geometry, data);
polygonReplay.drawCircleGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
var textReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.TEXT);
textReplay.setTextStyle(textStyle);
textReplay.drawText(geometry.getCenter(), 0, 2, 2, geometry, data);
textReplay.drawText(geometry.getCenter(), 0, 2, 2, geometry, feature);
}
};
@@ -78,20 +78,19 @@ ol.renderer.vector.renderCircleGeometry_ =
* @param {ol.Feature} feature Feature.
* @param {ol.style.Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {Object} data Opaque data object.
* @param {function(this: T, goog.events.Event)} listener Listener function.
* @param {T} thisArg Value to use as `this` when executing `listener`.
* @return {boolean} `true` if style is loading.
* @template T
*/
ol.renderer.vector.renderFeature = function(
replayGroup, feature, style, squaredTolerance, data, listener, thisArg) {
replayGroup, feature, style, squaredTolerance, listener, thisArg) {
var loading = false;
var imageStyle, imageState;
imageStyle = style.getImage();
if (goog.isNull(imageStyle)) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance, data);
replayGroup, feature, style, squaredTolerance);
} else {
imageState = imageStyle.getImageState();
if (imageState == ol.style.ImageState.LOADED ||
@@ -99,7 +98,7 @@ ol.renderer.vector.renderFeature = function(
imageStyle.unlistenImageChange(listener, thisArg);
if (imageState == ol.style.ImageState.LOADED) {
ol.renderer.vector.renderFeature_(
replayGroup, feature, style, squaredTolerance, data);
replayGroup, feature, style, squaredTolerance);
}
} else {
if (imageState == ol.style.ImageState.IDLE) {
@@ -120,11 +119,10 @@ ol.renderer.vector.renderFeature = function(
* @param {ol.Feature} feature Feature.
* @param {ol.style.Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderFeature_ = function(
replayGroup, feature, style, squaredTolerance, data) {
replayGroup, feature, style, squaredTolerance) {
var geometry = feature.getGeometry();
if (!goog.isDefAndNotNull(geometry)) {
return;
@@ -133,7 +131,7 @@ ol.renderer.vector.renderFeature_ = function(
var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[simplifiedGeometry.getType()];
goog.asserts.assert(goog.isDef(geometryRenderer));
geometryRenderer(replayGroup, simplifiedGeometry, style, data);
geometryRenderer(replayGroup, simplifiedGeometry, style, feature);
};
@@ -141,11 +139,11 @@ ol.renderer.vector.renderFeature_ = function(
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderGeometryCollectionGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.GeometryCollection);
var geometries = geometry.getGeometriesArray();
var i, ii;
@@ -153,7 +151,7 @@ ol.renderer.vector.renderGeometryCollectionGeometry_ =
var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[geometries[i].getType()];
goog.asserts.assert(goog.isDef(geometryRenderer));
geometryRenderer(replayGroup, geometries[i], style, data);
geometryRenderer(replayGroup, geometries[i], style, feature);
}
};
@@ -162,25 +160,25 @@ ol.renderer.vector.renderGeometryCollectionGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderLineStringGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.LineString);
var strokeStyle = style.getStroke();
if (!goog.isNull(strokeStyle)) {
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
lineStringReplay.setFillStrokeStyle(null, strokeStyle);
lineStringReplay.drawLineStringGeometry(geometry, data);
lineStringReplay.drawLineStringGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
var textReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.TEXT);
textReplay.setTextStyle(textStyle);
textReplay.drawText(geometry.getFlatMidpoint(), 0, 2, 2, geometry, data);
textReplay.drawText(geometry.getFlatMidpoint(), 0, 2, 2, geometry, feature);
}
};
@@ -189,18 +187,18 @@ ol.renderer.vector.renderLineStringGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderMultiLineStringGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString);
var strokeStyle = style.getStroke();
if (!goog.isNull(strokeStyle)) {
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.LINE_STRING);
lineStringReplay.setFillStrokeStyle(null, strokeStyle);
lineStringReplay.drawMultiLineStringGeometry(geometry, data);
lineStringReplay.drawMultiLineStringGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
@@ -209,7 +207,7 @@ ol.renderer.vector.renderMultiLineStringGeometry_ =
textReplay.setTextStyle(textStyle);
var flatMidpointCoordinates = geometry.getFlatMidpoints();
textReplay.drawText(flatMidpointCoordinates, 0,
flatMidpointCoordinates.length, 2, geometry, data);
flatMidpointCoordinates.length, 2, geometry, feature);
}
};
@@ -218,11 +216,11 @@ ol.renderer.vector.renderMultiLineStringGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderMultiPolygonGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon);
var fillStyle = style.getFill();
var strokeStyle = style.getStroke();
@@ -230,7 +228,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawMultiPolygonGeometry(geometry, data);
polygonReplay.drawMultiPolygonGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
@@ -239,7 +237,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
textReplay.setTextStyle(textStyle);
var flatInteriorPointCoordinates = geometry.getFlatInteriorPoints();
textReplay.drawText(flatInteriorPointCoordinates, 0,
flatInteriorPointCoordinates.length, 2, geometry, data);
flatInteriorPointCoordinates.length, 2, geometry, feature);
}
};
@@ -248,25 +246,25 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderPointGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.Point);
var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) {
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);
imageReplay.drawPointGeometry(geometry, data);
imageReplay.drawPointGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
var textReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.TEXT);
textReplay.setTextStyle(textStyle);
textReplay.drawText(geometry.getCoordinates(), 0, 2, 2, geometry, data);
textReplay.drawText(geometry.getCoordinates(), 0, 2, 2, geometry, feature);
}
};
@@ -275,18 +273,18 @@ ol.renderer.vector.renderPointGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderMultiPointGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.MultiPoint);
var imageStyle = style.getImage();
if (!goog.isNull(imageStyle)) {
var imageReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.IMAGE);
imageReplay.setImageStyle(imageStyle);
imageReplay.drawMultiPointGeometry(geometry, data);
imageReplay.drawMultiPointGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
@@ -295,7 +293,7 @@ ol.renderer.vector.renderMultiPointGeometry_ =
textReplay.setTextStyle(textStyle);
var flatCoordinates = geometry.getFlatCoordinates();
textReplay.drawText(flatCoordinates, 0, flatCoordinates.length,
geometry.getStride(), geometry, data);
geometry.getStride(), geometry, feature);
}
};
@@ -304,11 +302,11 @@ ol.renderer.vector.renderMultiPointGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @param {ol.Feature} feature Feature.
* @private
*/
ol.renderer.vector.renderPolygonGeometry_ =
function(replayGroup, geometry, style, data) {
function(replayGroup, geometry, style, feature) {
goog.asserts.assertInstanceof(geometry, ol.geom.Polygon);
var fillStyle = style.getFill();
var strokeStyle = style.getStroke();
@@ -316,7 +314,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), ol.render.ReplayType.POLYGON);
polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
polygonReplay.drawPolygonGeometry(geometry, data);
polygonReplay.drawPolygonGeometry(geometry, feature);
}
var textStyle = style.getText();
if (!goog.isNull(textStyle)) {
@@ -324,7 +322,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
style.getZIndex(), ol.render.ReplayType.TEXT);
textReplay.setTextStyle(textStyle);
textReplay.drawText(
geometry.getFlatInteriorPoint(), 0, 2, 2, geometry, data);
geometry.getFlatInteriorPoint(), 0, 2, 2, geometry, feature);
}
};