round randomly generated coordinates (#2765)

contribs/application/src/main/java/org/matsim/application/prepare/population/AdjustActivityToLinkDistances.java

@@ -134,6 +134,7 @@ public Integer call() throws Exception {
 							v = new Coord(coord.getX() - y * m, coord.getY() + x * m);
 						}
 
+						v = CoordUtils.round(v);
 
 						mapping.put(act.getCoord(), v);
 					}

contribs/application/src/main/java/org/matsim/application/prepare/population/ExtractHomeCoordinates.java

@@ -8,17 +8,18 @@
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.options.CsvOptions;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.utils.geometry.CoordUtils;
 import picocli.CommandLine;
 
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 @CommandLine.Command(
-		name = "extract-home-coordinates",
-		description = "Extract the home coordinates of a person"
+	name = "extract-home-coordinates",
+	description = "Extract the home coordinates of a person"
 )
-public class ExtractHomeCoordinates implements MATSimAppCommand {
+public final class ExtractHomeCoordinates implements MATSimAppCommand {
 
 	private static final Logger log = LogManager.getLogger(ExtractHomeCoordinates.class);
 
@@ -34,6 +35,29 @@ public class ExtractHomeCoordinates implements MATSimAppCommand {
 	@CommandLine.Mixin
 	private CsvOptions options = new CsvOptions();
 
+	/**
+	 * Set and return home coordinate of this person. Can be null if no home activity is known.
+	 */
+	public static Coord setHomeCoordinate(Person person) {
+		for (Plan plan : person.getPlans()) {
+			for (PlanElement planElement : plan.getPlanElements()) {
+				if (planElement instanceof Activity) {
+					String actType = ((Activity) planElement).getType();
+					if (actType.startsWith("home")) {
+						Coord homeCoord = CoordUtils.round(((Activity) planElement).getCoord());
+
+						person.getAttributes().putAttribute("home_x", homeCoord.getX());
+						person.getAttributes().putAttribute("home_y", homeCoord.getY());
+
+						return homeCoord;
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+
 	@Override
 	public Integer call() throws Exception {
 
@@ -42,24 +66,9 @@ public Integer call() throws Exception {
 		Map<Person, Coord> coords = new LinkedHashMap<>();
 
 		for (Person person : population.getPersons().values()) {
-			outer:
-			for (Plan plan : person.getPlans()) {
-				for (PlanElement planElement : plan.getPlanElements()) {
-					if (planElement instanceof Activity) {
-						String actType = ((Activity) planElement).getType();
-						if (actType.startsWith("home")) {
-							Coord homeCoord = ((Activity) planElement).getCoord();
-							coords.put(person, homeCoord);
-
-							person.getAttributes().putAttribute("home_x", homeCoord.getX());
-							person.getAttributes().putAttribute("home_y", homeCoord.getY());
-
-							break outer;
-						}
-					}
-				}
-
-			}
+			Coord coord = setHomeCoordinate(person);
+			if (coord != null)
+				coords.put(person, coord);
 		}
 
 		if (csv != null) {

contribs/application/src/main/java/org/matsim/application/prepare/population/ResolveGridCoordinates.java

@@ -14,6 +14,7 @@
 import org.matsim.application.options.ShpOptions;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.utils.geometry.CoordUtils;
 import org.matsim.core.utils.geometry.geotools.MGC;
 import picocli.CommandLine;
 
@@ -93,7 +94,7 @@ public Integer call() throws Exception {
 
 						Coord newCoord = mapping.getOrDefault(coord, null);
 						if (newCoord == null) {
-							newCoord = landuse.select(crs.getInputCRS(),
+							newCoord = CoordUtils.round(landuse.select(crs.getInputCRS(),
 									() -> {
 										double x = rnd.nextDouble(-gridResolution / 2, gridResolution / 2);
 										double y = rnd.nextDouble(-gridResolution / 2, gridResolution / 2);
@@ -103,7 +104,7 @@ public Integer call() throws Exception {
 										else
 											return new Coord(coord.getX() + x, coord.getY() + y);
 									}
-							);
+							));
 							mapping.put(coord, newCoord);
 						}