Add longitudeLatitude field to feed - json of 'lng' and 'lat' to make…

… it more explicit
orcasound · Jul 26, 2023 · b329c3c · b329c3c
1 parent 6b3873f
commit b329c3c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/server/lib/orcasite/radio_legacy/radio_legacy.ex b/server/lib/orcasite/radio_legacy/radio_legacy.ex
@@ -5,7 +5,7 @@ defmodule Orcasite.RadioLegacy do
 
  import Ecto.Query, warn: false
  alias Orcasite.Repo
- alias Orcasite.RadioLegacy.{Feed, Detection, Candidate}
+ alias Orcasite.RadioLegacy.{Detection, Candidate}
 
  def verify_can_submit_detection(
  feed_id,

diff --git a/server/lib/orcasite_web/graphql/types/feed.ex b/server/lib/orcasite_web/graphql/types/feed.ex
@@ -20,6 +20,16 @@ defmodule OrcasiteWeb.Types.Feed do
  end)
  end
 
+ field :longitude_latitude, non_null(:json) do
+ resolve(fn
+ %{location_point: %{coordinates: {lng, lat}}}, _, _ ->
+ {:ok, %{lng: lng, lat: lat}}
+
+ _, _, _ ->
+ {:ok, %{}}
+ end)
+ end
+
  field :thumb_url, non_null(:string) do
  resolve(fn %{node_name: node_name}, _, _ ->
  {:ok, feed_s3_url(node_name, "thumbnail.png")}

diff --git a/ui/src/components/Map.tsx b/ui/src/components/Map.tsx
@@ -17,7 +17,7 @@ export default function Map({
  feeds,
 }: {
  setMap?: (map: LeafletMap) => void
- currentFeed?: Pick<Feed, 'slug' | 'locationPoint'>
+ currentFeed?: Pick<Feed, 'slug' | 'longitudeLatitude'>
  feeds: FeedsQuery['feeds']
 }) {
  const router = useRouter()
@@ -50,7 +50,7 @@ export default function Map({
  {feeds.map((feed) => (
  <Marker
  key={feed.slug}
- position={feed.locationPoint.coordinates}
+ position={feed.longitudeLatitude}
  icon={
  feed.slug === currentFeed?.slug
  ? hydrophoneActiveIcon

diff --git a/ui/src/components/MapLayout.tsx b/ui/src/components/MapLayout.tsx
@@ -46,7 +46,7 @@ function MapLayout({ children }: { children: ReactNode }) {
  useEffect(() => {
  if (feed && feed.slug !== currentFeed?.slug) {
  setCurrentFeed(feed)
- map?.panTo(feed.locationPoint.coordinates)
+ map?.panTo(feed.longitudeLatitude)
  }
  }, [feed, map, currentFeed])
 

diff --git a/ui/src/components/Player/Player.tsx b/ui/src/components/Player/Player.tsx
@@ -153,7 +153,7 @@ export default function Player({
  </Box>
  <Box sx={{ mx: 4, flexGrow: 1, textAlign: 'end' }}>
  {currentFeed &&
- `${currentFeed.locationPoint.coordinates[0]}, ${currentFeed.locationPoint.coordinates[1]}`}
+ `${currentFeed.longitudeLatitude["lng"]}, ${currentFeed.longitudeLatitude["lat"]}`}
  </Box>
  </Box>
  )

diff --git a/ui/src/graphql/generated/index.ts b/ui/src/graphql/generated/index.ts
@@ -105,6 +105,7 @@ export type Feed = {
  id: Scalars['ID']['output']
  introHtml: Scalars['String']['output']
  locationPoint: Scalars['Json']['output']
+ longitudeLatitude: Scalars['Json']['output']
  mapUrl: Scalars['String']['output']
  name: Scalars['String']['output']
  nodeName: Scalars['String']['output']
@@ -254,6 +255,7 @@ export type FeedQuery = {
  slug: string
  nodeName: string
  locationPoint: any
+ longitudeLatitude: any
  introHtml: string
  thumbUrl: string
  mapUrl: string
@@ -271,6 +273,7 @@ export type FeedsQuery = {
  slug: string
  nodeName: string
  locationPoint: any
+ longitudeLatitude: any
  thumbUrl: string
  mapUrl: string
  }>
@@ -335,6 +338,7 @@ export const FeedDocument = `
  slug
  nodeName
  locationPoint
+ longitudeLatitude
  introHtml
  thumbUrl
  mapUrl
@@ -363,6 +367,7 @@ export const FeedsDocument = `
  slug
  nodeName
  locationPoint
+ longitudeLatitude
  thumbUrl
  mapUrl
  }

diff --git a/ui/src/graphql/queries/getFeed.graphql b/ui/src/graphql/queries/getFeed.graphql
@@ -5,6 +5,7 @@ query feed($slug: String!) {
  slug
  nodeName
  locationPoint
+ longitudeLatitude
  introHtml
  thumbUrl
  mapUrl

diff --git a/ui/src/graphql/queries/listFeeds.graphql b/ui/src/graphql/queries/listFeeds.graphql
@@ -5,6 +5,7 @@ query feeds {
  slug
  nodeName
  locationPoint
+ longitudeLatitude
  thumbUrl
  mapUrl
  }