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

Jump to bottom

[SEDONA-18] error reading shapefile #569

Merged
merged 4 commits into from
Dec 9, 2021
Merged

[SEDONA-18] error reading shapefile #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01c4c0e
[SEDONA-18] Fix shapefile reading error
Dec 8, 2021
5859432
[SEDONA-18] Add test resource files
Dec 9, 2021
78431fd
[SEDONA-18] Delete empty lines
Dec 9, 2021
1bbca93
[SEDONA-18] Use the existing shapefile in the resources, use the exis…
Dec 9, 2021
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
18 changes: 17 additions & 1 deletion ...ain/java/org/apache/sedona/core/formatMapper/shapefileParser/shapes/ShapeInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@
public class ShapeInputFormat
extends CombineFileInputFormat<ShapeKey, PrimitiveShape>
{
/**
* suffix of attribute file
*/
private final static String DBF_SUFFIX = "dbf";
/**
* suffix of shape record file
*/
private final static String SHP_SUFFIX = "shp";
/**
* suffix of index file
*/
private final static String SHX_SUFFIX = "shx";

public RecordReader<ShapeKey, PrimitiveShape> createRecordReader(InputSplit split, TaskAttemptContext context)
throws IOException
{
Expand Down Expand Up @@ -86,10 +99,13 @@ public List<InputSplit> getSplits(JobContext job)

for (Path filePath : filePathSizePair.keySet()) {
String filename = FilenameUtils.removeExtension(filePath.getName()).toLowerCase();
String suffix = FilenameUtils.getExtension(filePath.getName()).toLowerCase();

fileSplitPathParts.add(filePath);
fileSplitSizeParts.add(filePathSizePair.get(filePath));

if (prevfilename != "" && !prevfilename.equals(filename)) {
if (prevfilename != "" && !prevfilename.equals(filename)
&& (suffix.equals(SHX_SUFFIX) || suffix.equals(DBF_SUFFIX) || suffix.equals(SHP_SUFFIX))) {
// compare file name and if it is different then all same filename is into CombileFileSplit
splits.add(new CombineFileSplit(fileSplitPathParts.toArray(new Path[0]), Longs.toArray(fileSplitSizeParts)));
fileSplitPathParts.clear();
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/apache/sedona/core/formatMapper/shapefileParser/shapes/ShapefileReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void testShapefileEndWithUndefinedType()
}

/**
* Test correctness of parsing shapefile
* Test correctness of parsing shapefile. There are additional unnecessary files in directory
*
* @throws IOException
*/
Expand Down
5 changes: 5 additions & 0 deletions core/src/test/resources/shapefiles/polygon/map.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<test>
<testName>testReadToGeometryRDD</testName>
<fileName>map</fileName>
<desc>additional file</desc>
</test>
5 changes: 5 additions & 0 deletions core/src/test/resources/shapefiles/polygon/map1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<test>
<testName>testReadToGeometryRDD</testName>
<fileName>map1</fileName>
<desc>additional file</desc>
</test>