Revision: 6017
http://sourceforge.net/p/jump-pilot/code/6017
Author: michaudm
Date: 2018-12-16 11:22:24 +0000 (Sun, 16 Dec 2018)
Log Message:
-----------
RoadMatcher 1.6.2 fix bugs reported by Rajesh Dhull on 2018-12-02 (on
openjump-users list)
Modified Paths:
--------------
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/PlaceBackward.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/QuantumIndex.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitEdgesBuilder.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPath.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPathMatcher.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/RoadMatcherExtension.java
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/PlaceBackward.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/PlaceBackward.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/PlaceBackward.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -120,7 +120,12 @@
indexToShift--;
// no hole - keep shifting back
}
+ // added on 2018-12-16 to prevent an exception reported on openjum-users
forum
+ else if (thisIndex.isFirst()) {
+ break;
+ }
else {
+ System.out.println("thisIndex = " + thisIndex);
splitNodes[indexToShift].setPlace(thisIndex.prev());
foundHole = true;
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/QuantumIndex.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/QuantumIndex.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/QuantumIndex.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -71,7 +71,7 @@
}
/**
- * Computes the index of the next quantum in order along this path.
+ * Computes the index of the previous quantum in order along this path.
*
* @return the index of the previous quantum
*
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitEdgesBuilder.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitEdgesBuilder.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitEdgesBuilder.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -32,7 +32,10 @@
for (int i = 0; i < allPathNodes.size() - 1; i++) {
SplitEdgeNode node0 = (SplitEdgeNode) allPathNodes.get(i);
SplitEdgeNode node1 = (SplitEdgeNode) allPathNodes.get(i + 1);
- splitEdges.add(buildSplitEdge(i, splitPath, node0, node1,
node0.splittingEdgeIndex));
+ SplitEdge edge = buildSplitEdge(i, splitPath, node0, node1,
node0.splittingEdgeIndex);
+ if (edge.getGeometry() != null) {
+ splitEdges.add(edge);
+ }
}
return splitEdges;
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPath.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPath.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPath.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -162,9 +162,9 @@
{
for (Iterator i = splitEdges.iterator(); i.hasNext(); ) {
SplitEdge e = (SplitEdge) i.next();
- System.out.println("splitedge[" + e.getEdgeIndex() + "] "
- + " src edge: " + e.getSourceEdgeIndex()
- + " splitting edge: " + e.getSplittingEdgeIndex());
+ //System.out.println("splitedge[" + e.getEdgeIndex() + "] "
+ // + " src edge: " + e.getSourceEdgeIndex()
+ // + " splitting edge: " + e.getSplittingEdgeIndex());
}
}
}
\ No newline at end of file
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPathMatcher.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPathMatcher.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/linearpathmatch/split/SplitPathMatcher.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -189,8 +189,8 @@
}
Debug.println("found matched split edge parent index mismatch: "
+ matchIndexStr);
- Debug.println(splitPath[0].getGeometry());
- Debug.println(splitPath[1].getGeometry());
+ //Debug.println(splitPath[0].getGeometry());
+ //Debug.println(splitPath[1].getGeometry());
}
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/RoadMatcherExtension.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/RoadMatcherExtension.java
2018-12-06 15:34:57 UTC (rev 6016)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/RoadMatcherExtension.java
2018-12-16 11:22:24 UTC (rev 6017)
@@ -63,7 +63,7 @@
import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
public class RoadMatcherExtension extends Extension {
- public static final String VERSION = "1.6.1";
+ public static final String VERSION = "1.6.2";
public String getVersion() {
return VERSION;
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
