gemma: pkg/imports/dma.go comparison

Do not count skipped features as stored

author	Tom Gottfried <tom@intevation.de>
date	Wed, 03 Apr 2019 18:47:37 +0200
parents	899b591493b4
children	a5642ee4c6d0

comparison

equal deleted inserted replaced

-:80815b0a665c
+:074f2bb85584
 )
 )
 )).geom AS geom
 ) AS clipped
 WHERE clipped.geom IS NOT NULL
+RETURNING id
 `
 )
 // Do executes the actual fairway dimension import.
 func (dma *DistanceMarksAshore) Do(
 	var (
 		unsupported       = stringCounter{}
 		missingProperties int
 		badProperties     int
+		outside           int
 		features          int
 	)
 	if err := dl.Download(dma.User, dma.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 			case "Point":
 				var p pointSlice
 				if err := json.Unmarshal(*feature.Geometry.Coordinates, &p); err != nil {
 					return err
 				}
-				if _, err := insertStmt.ExecContext(
+				var dmaid int64
+				err := insertStmt.QueryRowContext(
 					ctx,
 					p.asWKB(),
 					epsg,
 					props.HydroCatdis,
-				); err != nil {
+				).Scan(&dmaid)
+				switch {
+				case err == sql.ErrNoRows:
+					outside++
+					// ignore -> filtered by responsibility area
+					continue
+				case err != nil:
 					return err
 				}
 				features++
 			default:
 				unsupported[feature.Geometry.Type]++
 	if len(unsupported) != 0 {
 		feedback.Warn("Unsupported types found: %s", unsupported)
 	}
+	if outside > 0 {
+		feedback.Info("Features outside responsibility area: %d", outside)
+	}
 	if features == 0 {
 		err := errors.New("No features found")
 		feedback.Error("%v", err)
 		return nil, err
 	}

Mercurial > gemma