Merge branch 'master' into kmt_UpdateDtdToTriggerWorkflow

.github/workflows/deploy-dtds.yaml

@@ -1,14 +1,15 @@
 name: deploy-dtds-on-website
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
+    types:
+      - closed
     paths:
-      - matsim/src/main/resources/dtd
+      - 'matsim/src/main/resources/dtd/**'
 
 jobs:
   rsync-dtds:
+    if: github.event.pull_request.merged == true  // only if PR closed by merging
     name: sync DTDs to website
     runs-on: ubuntu-latest
 

contribs/common/src/main/java/org/matsim/contrib/common/zones/systems/grid/square/SquareGridZoneSystem.java

@@ -55,7 +55,6 @@ public class SquareGridZoneSystem implements GridZoneSystem {
 
 	private final IdMap<Zone, Zone> zones = new IdMap<>(Zone.class);
 
-	private final IdMap<Zone, List<Link>> zoneToLinksMap = new IdMap<>(Zone.class);
 	private final Map<Integer, List<Link>> index2Links;
 	private final Network network;
 
@@ -114,7 +113,7 @@ public Optional<Zone> getZoneForCoord(Coord coord) {
 
 	@Override
 	public List<Link> getLinksForZoneId(Id<Zone> zone) {
-		return zoneToLinksMap.get(zone);
+		return this.index2Links.get(Integer.parseInt(zone.toString()));
 	}
 
 	private Optional<Zone> getOrCreateZone(Coord coord) {
@@ -129,12 +128,6 @@ private Optional<Zone> getOrCreateZone(Coord coord) {
 			if(zoneFilter.test(zone)) {
 				internalZones[index] = zone;
 				zones.put(zone.getId(), zone);
-				List<Link> linkList = zoneToLinksMap.computeIfAbsent(zone.getId(), zoneId -> new ArrayList<>());
-				List<Link> links = index2Links.get(index);
-				if(links!=null)
-				{
-					linkList.addAll(links);
-				}
 			} else {
 				return Optional.empty();
 			}