add point location in search result

Author: tsirysndr

mada/commune.go

@@ -18,6 +18,7 @@ type Commune struct {
 	District    string         `json:"district"`
 	Country     string         `json:"country"`
 	Coordinates [][]geom.Coord `json:"coordinates"`
+	Point       geom.Coord     `json:"point,omitempty"`
 }
 
 type CommuneService struct {

mada/district.go

@@ -17,6 +17,7 @@ type District struct {
 	Region      string         `json:"region"`
 	Country     string         `json:"country"`
 	Coordinates [][]geom.Coord `json:"coordinates"`
+	Point       geom.Coord     `json:"point,omitempty"`
 }
 
 type DistrictService struct {

mada/fokontany.go

@@ -13,6 +13,7 @@ import (
 )
 
 type Fokontany struct {
+	Point       geom.Coord     `json:"point,omitempty"`
 	ID          string         `json:"id"`
 	Name        string         `json:"name"`
 	Commune     string         `json:"commune"`

mada/region.go

@@ -16,6 +16,7 @@ type Region struct {
 	Name        string         `json:"name"`
 	Country     string         `json:"country"`
 	Coordinates [][]geom.Coord `json:"coordinates"`
+	Point       geom.Coord     `json:"point,omitempty"`
 }
 
 type RegionService struct {

mada/search.go

@@ -125,11 +125,14 @@ func searchInFokontany(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
 				District:    district,
 				Country:     country,
 				Coordinates: p.(*geom.Polygon).Coords(),
+				Point:       geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
 			}, "", "  ")
 			fmt.Println(string(b))
 			return noresults
 		}
 		fmt.Printf(`
+        point
+                %v
         id
                 %s
         name
@@ -146,7 +149,7 @@ func searchInFokontany(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
                 fokontany
         geometry
                 %v
-	`, uid, name, commune, district, region, country, p.(*geom.Polygon).Coords())
+	`, geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(), uid, name, commune, district, region, country, p.(*geom.Polygon).Coords())
 
 	}
 	return noresults
@@ -175,11 +178,14 @@ func searchInCommune(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
 				District:    district,
 				Country:     country,
 				Coordinates: p.(*geom.Polygon).Coords(),
+				Point:       geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
 			}, "", "  ")
 			fmt.Println(string(b))
 			return noresults
 		}
 		fmt.Printf(`
+        point
+                %v
         id
                 %s
         name
@@ -194,7 +200,15 @@ func searchInCommune(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
                 commune
         geometry
                 %v
-	`, uid, name, district, region, country, p.(*geom.Polygon).Coords())
+	`,
+			geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
+			uid,
+			name,
+			district,
+			region,
+			country,
+			p.(*geom.Polygon).Coords(),
+		)
 
 	}
 	return noresults
@@ -222,11 +236,14 @@ func searchInDistrict(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
 				Region:      region,
 				Country:     country,
 				Coordinates: p.(*geom.Polygon).Coords(),
+				Point:       geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
 			}, "", "  ")
 			fmt.Println(string(b))
 			return noresults
 		}
 		fmt.Printf(`
+        point
+                %v
         id
                 %s
         name
@@ -239,7 +256,14 @@ func searchInDistrict(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
                 district
         geometry
                 %v
-	`, uid, name, region, country, p.(*geom.Polygon).Coords())
+	`,
+			geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
+			uid,
+			name,
+			region,
+			country,
+			p.(*geom.Polygon).Coords(),
+		)
 
 	}
 	return noresults
@@ -266,11 +290,14 @@ func searchInRegion(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
 				Name:        name,
 				Country:     country,
 				Coordinates: p.(*geom.Polygon).Coords(),
+				Point:       geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
 			}, "", "  ")
 			fmt.Println(string(b))
 			return noresults
 		}
 		fmt.Printf(`
+	      point
+	              %v
         id
                 %s
         name
@@ -281,7 +308,13 @@ func searchInRegion(db *sql.DB, area olc.CodeArea, opt SearchOptions) bool {
                 region
         geometry
                 %v
-	`, uid, name, country, p.(*geom.Polygon).Coords())
+	`,
+			geom.NewPoint(geom.XY).MustSetCoords(geom.Coord{area.LngLo, area.LatLo}).Coords(),
+			uid,
+			name,
+			country,
+			p.(*geom.Polygon).Coords(),
+		)
 
 	}
 	return noresults