fix(vector): normalize feature geometry to input geometry

esarder · Apr 11, 2019 · c1040a5 · c1040a5
1 parent 8972238
commit c1040a5
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/os/source/vectorsource.js b/src/os/source/vectorsource.js
@@ -2852,6 +2852,11 @@ os.source.Vector.prototype.getFeaturesInGeometry = function(geometry, opt_featur
  */
 os.source.Vector.prototype.isGeometryInArea_ = function(area, geometry, opt_rectangular) {
   var match = false;
+  var proj = os.map.PROJECTION;
+  var wrap = proj.canWrapX() && this.getWrapX();
+  var projExtent = proj.getExtent();
+  var halfWidth = (projExtent[2] - projExtent[0]) / 2;
+
   var geomType = geometry.getType();
   switch (geomType) {
     case ol.geom.GeometryType.GEOMETRY_COLLECTION:
@@ -2901,6 +2906,8 @@ os.source.Vector.prototype.isGeometryInArea_ = function(area, geometry, opt_rect
     case ol.geom.GeometryType.POLYGON:
     case ol.geom.GeometryType.CIRCLE:
     case ol.geom.GeometryType.MULTI_LINE_STRING:
+      geometry = geometry.clone();
+      os.geo2.normalizeGeometryCoordinates(geometry, area.getCoordinates()[0].x);
       var jstsGeometry = os.geo.jsts.OLParser.getInstance().read(geometry);
       match = jstsGeometry != null &&
           (area.contains(jstsGeometry) || area.crosses(jstsGeometry) || area.overlaps(jstsGeometry));
@@ -2924,6 +2931,11 @@ os.source.Vector.prototype.isGeometryInArea_ = function(area, geometry, opt_rect
       }
 
       for (i = 0, n = jstsAreas.length; i < n; i++) {
+        if (wrap) {
+          var first = jstsAreas[i].vertX[0];
+          x = os.geo2.normalizeLongitude(x, first - halfWidth, first + halfWidth);
+        }
+
         if (opt_rectangular || os.geo.isCoordInArea(x, y, jstsAreas[i].vertX, jstsAreas[i].vertY, jstsAreas[i].nVert)) {
           match = true;
           break;