AutoNodeTitles + Location in D7

On my site Node titles are automatically made from their addresses using AutoNodeTitles module. Like this: "Street, City". In Drupal 6 for AutoNoteTitles I used the following PHP

<?php
return $node->field_location[0]['street'] . ', ' . $node->field_location[0]['city'];
?>

In D6 it works like a charm!

Now I'm trying to move to D7 and I have no clue about the code that I need.

Can anybody from Location maintainers help, please?