diff --git a/public/static/plugs/mapLocation/mapLocation.js b/public/static/plugs/mapLocation/mapLocation.js
index 6c7e263..ce83601 100644
--- a/public/static/plugs/mapLocation/mapLocation.js
+++ b/public/static/plugs/mapLocation/mapLocation.js
@@ -161,6 +161,7 @@
                     var address = response.result.formatted_address;
                     var locationLongitude = e.latlng.lng;
                     var locationLatitude = e.latlng.lat;
+                    var addressComponent = response.result.addressComponent;
 
                     if (options.location) {
                         $(options.location).val(address);
@@ -171,6 +172,33 @@
                     if (options.locationLongitude) {
                         $(options.locationLongitude).val(locationLongitude);
                     }
+                    if (options.locationProvince) {
+                        $(options.locationProvince).val(addressComponent.province);
+                    }
+                    if (options.locationCity) {
+                        $(options.locationCity).val(addressComponent.city);
+                    }
+                    if (options.locationCounty) {
+                        $(options.locationCounty).val(addressComponent.county);
+                    }
+                    if (options.locationTown) {
+                        $(options.locationTown).val(addressComponent.town);
+                    }
+                    if (options.locationRoad) {
+                        $(options.locationRoad).val(addressComponent.road);
+                    }
+                    if (options.locationProvinceCode) {
+                        $(options.locationProvinceCode).val((addressComponent.province_code || '').replace(/^156/, ''));
+                    }
+                    if (options.locationCityCode) {
+                        $(options.locationCityCode).val((addressComponent.city_code || '').replace(/^156/, ''));
+                    }
+                    if (options.locationCountyCode) {
+                        $(options.locationCountyCode).val((addressComponent.county_code || '').replace(/^156/, ''));
+                    }
+                    if (options.locationTownCode) {
+                        $(options.locationTownCode).val((addressComponent.town_code || '').replace(/^156/, ''));
+                    }
                 });
             });
         }