add version to event payload

Author: VladislavMedved

lib/events.js

@@ -179,7 +179,8 @@ MapboxEventManager.prototype = {
       routing: geocoder.options.routing,
       worldview: geocoder.options.worldview,
       mapZoom: zoom,
-      keyboardLocale: this.locale
+      keyboardLocale: this.locale,
+      version: geocoder.options.version
     }
 
     // get the text in the search bar

lib/index.js

@@ -568,11 +568,13 @@ MapboxGeocoder.prototype = {
 
   _fly: function(selected) {
     var flyOptions;
-    const { context, short_code } = selected.properties;
-    const countryCode = this.options.version === 'v6' ?
-      context && context.country && context.country.country_code.toLowerCase() :
-      short_code;
-    if (selected.properties && exceptions[countryCode]) {
+    let exceptionCode;
+    if (this.options.version === 'v6' && selected.properties.feature_type === 'country') {
+      exceptionCode = selected.properties.context.country.country_code.toLowerCase();
+    } else if (this.options.version === 'v5') {
+      exceptionCode = selected.properties && selected.properties.short_code;
+    }
+    if (selected.properties && exceptions[exceptionCode]) {
       // Certain geocoder search results return (and therefore zoom to fit)
       // an unexpectedly large bounding box: for example, both Russia and the
       // USA span both sides of -180/180, or France includes the island of
@@ -581,7 +583,7 @@ MapboxGeocoder.prototype = {
       // short-term solution; this may be amended as necessary.
       flyOptions = extend({}, this.options.flyTo);
       if (this._map){
-        this._map.fitBounds(exceptions[countryCode].bbox, flyOptions);
+        this._map.fitBounds(exceptions[exceptionCode].bbox, flyOptions);
       }
     } else if (selected.bbox) {
       var bbox = selected.bbox;
@@ -899,7 +901,9 @@ MapboxGeocoder.prototype = {
     if (!results.features.length) return;
     var result = results.features[0];
     this._typeahead.selected = result;
-    this._inputEl.value = this.options.version === 'v6' ? result.properties.name : result.place_name;
+    this._inputEl.value = this.options.version === 'v6' ?
+      (result.properties.name + (result.properties.place_formatted ? `, ${result.properties.place_formatted}` : "")) :
+      result.place_name;
     this._onChange();
   },
 

lib/utils.js

@@ -86,8 +86,7 @@ function getV6AddressInfo(feature) {
 
   for (const contextProp in feature.context) {
     if (contextProp) {
-      const layer = contextProp.id.split(".")[0];
-      addrInfo[layer] = contextProp.name;
+      addrInfo[contextProp] = feature.context[contextProp].name;
     }
   }