Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1009: WKTWriter#writeMultiLineString produces invalid WKT string #1010

Merged
merged 3 commits into from
Oct 11, 2019
Merged

Fixes #1009: WKTWriter#writeMultiLineString produces invalid WKT string #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24ab4bb
Fix position of comma in WKTWriter result for MultiLineString
kad-topper Oct 5, 2019
455f764
Add test for WKTWriter#writeGeometry with MultiLineString as input
kad-topper Oct 5, 2019
65a6c14
Correct expected result in SFSProfilerTest#simplifyMultiCurve
kad-topper Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...e-core/deegree-core-base/src/test/java/org/deegree/geometry/wktadapter/WKTWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,22 @@ public void test_MultiPolygon()
writer.toString() );

}

@Test
public void test_MultiLineString()
throws XMLParsingException, XMLStreamException, FactoryConfigurationError, IOException,
UnknownCRSException {

Set<WKTFlag> flag = new HashSet<WKTFlag>();
Writer writer = new StringWriter();
WKTWriter WKTwriter = new WKTWriter( flag, decimalFormatter );
Geometry geom = parseGeometry( "MultiLineString.gml" );
WKTwriter.writeGeometry( geom, writer );
// System.out.print( writer.toString() + "\n" );
assertEquals( "MULTILINESTRING ((7.1 50.7,10.0 53.5,13.4 52.5),(7.1 50.7,10.0 53.5,13.4 52.5))", writer.toString() );

}


// ############################## PARSING THE GEOMETRY-FILE
private Geometry parseGeometry( String fileName )
Expand Down
5 changes: 2 additions & 3 deletions deegree-core/deegree-core-geometry/src/main/java/org/deegree/geometry/io/WKTWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,11 +1191,10 @@ public void writeMultiLineString( MultiLineString geometry, Writer writer )
for ( int i = 0; i < geometry.size(); i++ ) {
writer.append( '(' );
writeLineStringWithoutPrefix( geometry.get( i ), writer );
writer.append( ')' );
if ( i < geometry.size() - 1 ) {
writer.append( ',' );

writer.append( ',' );
}
writer.append( ')' );
}

writer.append( ')' );
Expand Down
2 changes: 1 addition & 1 deletion deegree-core/deegree-core-geometry/src/test/java/org/deegree/geometry/SFSProfilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public void simplifyMultiCurve() {
MultiCurve<?> multiCurve = fac.createMultiCurve( null, CRSUtils.EPSG_4326, memberCurves );
MultiLineString simplified = (MultiLineString) simplifier.simplify( multiCurve );
assertEquals(
"MULTILINESTRING ((0.000000 0.000000,1.000000 1.000000,5.000000 5.000000,10.000000 10.000000,)(0.000000 0.000000,1.000000 1.000000,5.000000 5.000000,10.000000 10.000000,12.317848 12.699677,14.612186 15.419362,16.882842 18.158850,19.129644 20.917935,21.352424 23.696410,23.551014 26.494065,25.725249 29.310690,27.874965 32.146073,30.000000 35.000000))",
"MULTILINESTRING ((0.000000 0.000000,1.000000 1.000000,5.000000 5.000000,10.000000 10.000000),(0.000000 0.000000,1.000000 1.000000,5.000000 5.000000,10.000000 10.000000,12.317848 12.699677,14.612186 15.419362,16.882842 18.158850,19.129644 20.917935,21.352424 23.696410,23.551014 26.494065,25.725249 29.310690,27.874965 32.146073,30.000000 35.000000))",
simplified.toString() );
}

Expand Down