Index: feedapi_mapper_location.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_location.inc,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 feedapi_mapper_location.inc
--- feedapi_mapper_location.inc	13 Jul 2009 21:29:25 -0000	1.1.2.4
+++ feedapi_mapper_location.inc	12 Aug 2009 14:51:10 -0000
@@ -11,7 +11,18 @@ function location_feedapi_mapper($op, $n
     return t('Maps pairs of geographic coordinates to the location of a node.');
   }
   else if ($op == 'list') {
-    $sub_fields = array('latitude' => t('Latitude'), 'longitude' => t('Longitude'));
+    $sub_fields = array(
+      'latitude' => t('Latitude'), 
+      'longitude' => t('Longitude'), 
+      'name' => t('Name'), 
+      'street' => t('Street'), 
+      'additional' => t('Additional'), 
+      'province' => t('Province'), 
+      'city' => t('City'), 
+      'postal_code' => t('Postal code'),
+      'country_name' => t('Country name'),
+      'country' => t('Country code'),
+      );
     $info = content_types($node->type);
     $fields = array();
     if (@count($info['fields'])) {
@@ -21,6 +32,12 @@ function location_feedapi_mapper($op, $n
         }
       }
     }
+    if (@!count($fields)) {
+      // check for location-provided (non CCK) fields enabled on that content type
+      if (variable_get('location_maxnum_'. $node->type, 0)) {
+        $fields['locations'] = $sub_fields;
+      }
+    }
     if (count($fields)) {
       return $fields;
     }