set the photo feature id after feature is uploaded

developmentseed · Dec 4, 2019 · 520df7d · 520df7d
1 parent 98a49ea
commit 520df7d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/__tests__/services/osm-api.test.js b/__tests__/services/osm-api.test.js
@@ -113,6 +113,6 @@ test('get feature in changeset', async () => {
   fetch.once(xmlData, { status: 200 })
   return getFeatureInChangeset(changesetId)
     .then(d => {
-      expect(d).toBe(4319440399)
+      expect(d).toBe('node/4319440399')
     })
 })
diff --git a/app/actions/camera.js b/app/actions/camera.js
@@ -58,11 +58,12 @@ export function savedPhoto (photo) {
   }
 }
 
-export function editPhoto (photo, description) {
+export function editPhoto (photo, description, featureId) {
   return {
     type: types.EDIT_PHOTO,
     photo,
-    description
+    description,
+    featureId
   }
 }
 

diff --git a/app/actions/edit.js b/app/actions/edit.js
@@ -6,6 +6,7 @@ import { fetchDataForTile, setSelectedFeatures } from './map'
 import { getAllRetriable } from '../utils/edit-utils'
 import { getPhotosForFeature } from '../utils/photos'
 import { getFeatureInChangeset } from '../services/osm-api'
+import { editPhoto } from '../actions/camera'
 /**
  * Retries all retriable edits in the current state
  */
@@ -112,8 +113,10 @@ export function editUploaded (edit, changesetId) {
       if (associatedPhotos.length) {
         // get feature id
         const featureId = await getFeatureInChangeset(changesetId)
-        console.log('feature id for this photo', featureId)
         // fire action to update each photo feature id
+        for (let photo of associatedPhotos) {
+          dispatch(editPhoto(photo, photo.description, featureId))
+        }
       } else {
         // no photos associated. nothing to do
       }

diff --git a/app/components/PhotosItem.js b/app/components/PhotosItem.js
@@ -76,6 +76,10 @@ class PhotosItem extends React.PureComponent {
       case 'uploaded':
         return 'Uploaded'
       case 'pending':
+        if (item.errors.length === 0 && item.featureId.search('observe') > -1) {
+          return 'Waiting to upload associated feature...'
+        }
+
         if (item.errors.length === 0) {
           return 'Waiting for network...'
         }

diff --git a/app/reducers/camera.js b/app/reducers/camera.js
@@ -28,6 +28,7 @@ export default function (state = initialState, action) {
       let photos = [...state.photos]
       photos = photos.filter(photo => photo.id !== action.photo.id)
       editedPhoto.description = action.description
+      editedPhoto.featureId = action.featureId
       photos.push(editedPhoto)
       return {
         ...state,

diff --git a/app/screens/Photos/PhotoDetailScreen.js b/app/screens/Photos/PhotoDetailScreen.js
@@ -91,7 +91,7 @@ class PhotoDetailScreen extends React.Component {
         onPress: () => {
           const editing = !this.state.editing
           if (photo.description !== this.state.description) {
-            editPhoto(photo, this.state.description)
+            editPhoto(photo, this.state.description, photo.featureId)
           }
           this.setState({
             editing: editing

diff --git a/app/services/osm-api.js b/app/services/osm-api.js
@@ -316,10 +316,10 @@ export async function getFeatureInChangeset (changesetId) {
       const way = created.filter(c => {
         return Object.keys(c) === 'way'
       })
-      featureId = way[0]['$'].id
+      featureId = `way/${way[0]['$'].id}`
     } else {
-      featureId = created[0]['node'][0]['$'].id
+      featureId = `node/${created[0]['node'][0]['$'].id}`
     }
   }
-  return parseInt(featureId)
+  return featureId
 }