Merge pull request #2672 from kobotoolbox/2618-update-dependencies

Updates dependencies

Checked the following for same functionality:
- Rebuilding from scratch
- Media uploading
- Library questions
- QueryLimit/Maps
- Permissions

jsapp/js/components/map.es6

@@ -246,6 +246,17 @@ export class FormMap extends React.Component {
     // TODO: support area / line geodata questions
     let selectedQuestion = this.props.asset.map_styles.selectedQuestion || null;
 
+    this.props.asset.content.survey.forEach(function(row) {
+      if (
+        typeof row.label !== 'undefined' &&
+        row.label !== null &&
+        selectedQuestion === row.label[0] &&
+        row.type !== QUESTION_TYPES.get('geopoint').id
+      ) {
+        selectedQuestion = null; //Ignore if not a geopoint question type
+      }
+    });
+
     let queryLimit = QUERY_LIMIT_DEFAULT;
     if (this.state.overridenStyles && this.state.overridenStyles.querylimit) {
       queryLimit = this.state.overridenStyles.querylimit;