Map visible and workflow hopefully sensible

src/components/Observation.vue

@@ -52,14 +52,14 @@
 			</div>
        </div>
 
-    <div v-if="mapGeoinfo" class="row">
+    <div v-if="pest.pestId" class="row">
 		<div class="col-1"><font-awesome-icon style="font-size: x-large; margin-top: 7px;" icon="map-location" /></div>
 		<div class="col-7">
         <router-link 
 			id="linkMap" 
 			class="vips-btn" 
 			ref='linkMap' 
-			:to="{name:'MapObservation', params: {observationId:observation.observationId,geoinfo:mapGeoinfo,isMapPanelVisible:newMapPanel,locationPointOfInterestId:mapLocationPointOfInterestId,observationHeader:observationHeader, observationText:observationText, timeOfObservation:strDateObservation, observation:observation}}"
+			:to="{name:'MapObservation', params: {observationId:observation.observationId,geoinfo:mapGeoinfo,isMapPanelVisible:newMapPanel,locationPointOfInterestId:mapLocationPointOfInterestId, observation:observation}}"
 		>{{ $t("observation.map.label") }}</router-link>
 		</div>
     </div>
@@ -299,6 +299,7 @@ export default {
               - mainly from map component 
               - to hold crop, pest data
               */
+				
               if(this.paramObservation)
               {
                 
@@ -345,7 +346,7 @@ export default {
                    this.mapLocationPointOfInterestId    =   jsonObservation.locationPointOfInterestId;
                 }
               }
-              this.selectedCropId = this.observation.cropOrganism.organismId;
+              this.selectedCropId = this.observation.cropOrganismId;
           }
           else {
             //TODO for new Observation
@@ -354,6 +355,8 @@ export default {
 
       /** Get related crop and crop list for a selected Observation */
       getObservationCrops(jsonObservation){
+	
+			//console.info(jsonObservation);
         
               let lstCrops        = [];
               let lstCropIds      = [];