Fix ios regeocode

qiuxiang · May 5, 2019 · 1a68ce5 · 1a68ce5
1 parent fb3ef9b
commit 1a68ce5
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/lib/ios/AMapGeolocation.m b/lib/ios/AMapGeolocation.m
@@ -61,7 +61,7 @@ @implementation AMapGeolocation {
 }
 
 - (id)json:(CLLocation *)location reGeocode:(AMapLocationReGeocode *)reGeocode {
-  if (reGeocode && reGeocode.formattedAddress.length) {
+  if (reGeocode) {
     return @{
       @"accuracy" : @(location.horizontalAccuracy),
       @"latitude" : @(location.coordinate.latitude),
@@ -70,16 +70,16 @@ - (id)json:(CLLocation *)location reGeocode:(AMapLocationReGeocode *)reGeocode {
       @"speed" : @(location.speed),
       @"heading" : @(location.course),
       @"timestamp" : @(location.timestamp.timeIntervalSince1970 * 1000),
-      @"address" : reGeocode.formattedAddress,
-      @"poiName" : reGeocode.POIName ? reGeocode.POIName : "",
-      @"country" : reGeocode.country ? reGeocode.country : "",
-      @"province" : reGeocode.province ? reGeocode.country : "",
-      @"city" : reGeocode.city ? reGeocode.city : "",
-      @"cityCode" : reGeocode.citycode ? reGeocode.citycode : "",
-      @"district" : reGeocode.district ? reGeocode.district : "",
-      @"street" : reGeocode.street ? reGeocode.street : "",
-      @"streetNumber" : reGeocode.number ? reGeocode.number : "",
-      @"adCode" : reGeocode.adcode ? reGeocode.adcode : "",
+      @"address" : reGeocode.formattedAddress ? reGeocode.formattedAddress : @"",
+      @"poiName" : reGeocode.POIName ? reGeocode.POIName : @"",
+      @"country" : reGeocode.country ? reGeocode.country : @"",
+      @"province" : reGeocode.province ? reGeocode.country : @"",
+      @"city" : reGeocode.city ? reGeocode.city : @"",
+      @"cityCode" : reGeocode.citycode ? reGeocode.citycode : @"",
+      @"district" : reGeocode.district ? reGeocode.district : @"",
+      @"street" : reGeocode.street ? reGeocode.street : @"",
+      @"streetNumber" : reGeocode.number ? reGeocode.number : @"",
+      @"adCode" : reGeocode.adcode ? reGeocode.adcode : @"",
     };
   } else {
     return @{