/*******************************************************************************
 * Copyright (c) 2015 - 2017
 * <p>
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 * <p>
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 * <p>
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 *******************************************************************************/
package jsettlers.common.map.shapes;

import java.util.Iterator;

import jsettlers.common.movable.EDirection;
import jsettlers.common.utils.coordinates.ICoordinateConsumer;
import jsettlers.common.position.ShortPoint2D;

public class MapNeighboursArea implements IMapArea {
	private static final long serialVersionUID = -6205409596340280969L;

	private final int x;
	private final int y;

	public MapNeighboursArea(ShortPoint2D center) {
		this.x = center.x;
		this.y = center.y;
	}

	public MapNeighboursArea(int x, int y) {
		this.x = x;
		this.y = y;
	}

	@Override
	public boolean contains(ShortPoint2D position) {
		for (ShortPoint2D pos : this) {
			if (pos.equals(position)) {
				return true;
			}
		}
		return false;
	}

	@Override
	public Iterator<ShortPoint2D> iterator() {
		return new NeighbourIterator();
	}

	private class NeighbourIterator implements Iterator<ShortPoint2D> {
		int directionIndex = 0;

		@Override
		public boolean hasNext() {
			return directionIndex < EDirection.VALUES.length;
		}

		@Override
		public ShortPoint2D next() {
			return EDirection.VALUES[directionIndex++].getNextHexPoint(x, y);
		}

		@Override
		public void remove() {
			throw new UnsupportedOperationException();
		}
	}

	public static void iterate(int x, int y, ICoordinateConsumer consumer) {
		for (EDirection direction : EDirection.VALUES) {
			consumer.accept(x + direction.gridDeltaX, y + direction.gridDeltaY);
		}
	}
}

@@ -1361,16 +1361,146 @@
 ection;%0A
+import jsettlers.common.utils.coordinates.CoordinateStream;%0Aimport jsettlers.common.utils.coordinates.IBooleanCoordinateFunction;%0A
 import j
@@ -2810,11 +2810,528 @@
 ;%0A%09%09%7D%0A%09%7D
+%0A%0A%09public CoordinateStream stream() %7B%0A%09%09return stream(x, y);%0A%09%7D%0A%0A%09private static CoordinateStream stream(int centerX, int centerY) %7B%0A%09%09return new CoordinateStream() %7B%0A%09%09%09@Override%0A%09%09%09public boolean iterate(IBooleanCoordinateFunction function) %7B%0A%09%09%09%09for (EDirection direction : EDirection.values()) %7B%0A%09%09%09%09%09int x = direction.gridDeltaX + centerX;%0A%09%09%09%09%09int y = direction.gridDeltaY + centerY;%0A%0A%09%09%09%09%09boolean result = function.apply(x, y);%0A%09%09%09%09%09if (!result) %7B%0A%09%09%09%09%09%09return false;%0A%09%09%09%09%09%7D%0A%09%09%09%09%7D%0A%09%09%09%09return true;%0A%09%09%09%7D%0A%09%09%7D;%0A%09%7D
 %0A%7D%0A

Add stream method to MapNeighborsArea.