Merge pull request #231 from felix-schott/202_ndgeojson

Add support for ndgeojson

Author: tschaub

cmd/gpq/command/convert.go

@@ -17,6 +17,8 @@ package command
 import (
 	"net/url"
 	"os"
+	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/planetlabs/gpq/internal/geojson"
@@ -63,19 +65,38 @@ func parseFormatType(format string) FormatType {
 	return ft
 }
 
+var geoParquetSuffixes = []string{
+	".gpq", ".geoparquet",
+}
+
+var parquetSuffixes = []string{
+	".pq", ".parquet",
+}
+
+var geoJsonSuffixes = []string{
+	".geojson",
+	".json",
+	".ndjson",
+	".ndgeojson",
+	".geojsonl",
+}
+
 func getFormatType(resource string) FormatType {
 	if u, err := url.Parse(resource); err == nil {
 		resource = u.Path
 	}
-	if strings.HasSuffix(resource, ".json") || strings.HasSuffix(resource, ".geojson") {
-		return GeoJSONType
-	}
-	if strings.HasSuffix(resource, ".gpq") || strings.HasSuffix(resource, ".geoparquet") {
+
+	ext := filepath.Ext(resource)
+	if slices.Contains(geoParquetSuffixes, ext) {
 		return GeoParquetType
 	}
-	if strings.HasSuffix(resource, ".pq") || strings.HasSuffix(resource, ".parquet") {
+	if slices.Contains(parquetSuffixes, ext) {
 		return ParquetType
 	}
+	if slices.Contains(geoJsonSuffixes, ext) {
+		return GeoJSONType
+	}
+
 	return UnknownType
 }
 

internal/geojson/featurereader.go

@@ -67,6 +67,9 @@ func (r *FeatureReader) Read() (*geo.Feature, error) {
 
 		delim, ok := keyToken.(json.Delim)
 		if ok && delim == json.Delim('}') {
+			if r.decoder.More() {
+				r.collection = true
+			}
 			if feature == nil {
 				return nil, errors.New("expected a FeatureCollection, a Feature, or a Geometry object")
 			}

internal/geojson/featurereader_test.go

@@ -92,6 +92,48 @@ func TestFeatureReaderSingleFeature(t *testing.T) {
 	assert.Equal(t, map[string]any{"name": "test"}, feature.Properties)
 }
 
+func TestFeatureReaderNewLineDelimited(t *testing.T) {
+	file, openErr := os.Open("testdata/new-line-delimited.ndgeojson")
+	require.NoError(t, openErr)
+
+	reader := geojson.NewFeatureReader(file)
+
+	features := []*geo.Feature{}
+	for {
+		feature, err := reader.Read()
+		if err == io.EOF {
+			break
+		}
+		require.NoError(t, err)
+		features = append(features, feature)
+	}
+	require.Len(t, features, 5)
+
+	fiji := features[0]
+	assert.NotNil(t, fiji.Geometry)
+	assert.Equal(t, "Oceania", fiji.Properties["continent"])
+	assert.Equal(t, float64(920938), fiji.Properties["pop_est"])
+
+	usa := features[4]
+	assert.NotNil(t, usa.Geometry)
+	assert.Equal(t, "North America", usa.Properties["continent"])
+	assert.Equal(t, float64(326625791), usa.Properties["pop_est"])
+}
+
+func TestFeatureReaderBadNewLineDelimited(t *testing.T) {
+	file, openErr := os.Open("testdata/bad-new-line-delimited.ndgeojson")
+	require.NoError(t, openErr)
+
+	reader := geojson.NewFeatureReader(file)
+
+	first, err := reader.Read()
+	require.NoError(t, err)
+	assert.Equal(t, "Oceania", first.Properties["continent"])
+
+	_, err = reader.Read()
+	assert.ErrorContains(t, err, "unexpected end of JSON input")
+}
+
 func TestFeatureReaderEmptyFeatureCollection(t *testing.T) {
 	file, openErr := os.Open("testdata/empty-collection.geojson")
 	require.NoError(t, openErr)