@abi-software/flatmapvuer 0.3.12 → 0.3.13-beta-0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -87,6 +87,13 @@ module.exports =
87
87
  /************************************************************************/
88
88
  /******/ ({
89
89
 
90
+ /***/ "0654":
91
+ /***/ (function(module, exports, __webpack_require__) {
92
+
93
+ // extracted by mini-css-extract-plugin
94
+
95
+ /***/ }),
96
+
90
97
  /***/ "06f1":
91
98
  /***/ (function(module, exports, __webpack_require__) {
92
99
 
@@ -246,17 +253,6 @@ row.install = function (Vue) {
246
253
 
247
254
  /******/ });
248
255
 
249
- /***/ }),
250
-
251
- /***/ "126f":
252
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
253
-
254
- "use strict";
255
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_28f8b230_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("db06");
256
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_28f8b230_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_28f8b230_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
257
- /* unused harmony reexport * */
258
-
259
-
260
256
  /***/ }),
261
257
 
262
258
  /***/ "12f2":
@@ -776,13 +772,6 @@ module.exports = require("core-js/modules/es.array.push.js");
776
772
 
777
773
  /***/ }),
778
774
 
779
- /***/ "2804":
780
- /***/ (function(module, exports, __webpack_require__) {
781
-
782
- // extracted by mini-css-extract-plugin
783
-
784
- /***/ }),
785
-
786
775
  /***/ "2a5e":
787
776
  /***/ (function(module, exports, __webpack_require__) {
788
777
 
@@ -7643,6 +7632,13 @@ function objToArray(obj) {
7643
7632
 
7644
7633
  /***/ }),
7645
7634
 
7635
+ /***/ "813c":
7636
+ /***/ (function(module, exports, __webpack_require__) {
7637
+
7638
+ // extracted by mini-css-extract-plugin
7639
+
7640
+ /***/ }),
7641
+
7646
7642
  /***/ "831f":
7647
7643
  /***/ (function(module, exports) {
7648
7644
 
@@ -8614,6 +8610,17 @@ tag.install = function (Vue) {
8614
8610
 
8615
8611
  module.exports = require("vue");
8616
8612
 
8613
+ /***/ }),
8614
+
8615
+ /***/ "9418":
8616
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
8617
+
8618
+ "use strict";
8619
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_92af3352_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0654");
8620
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_92af3352_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_MultiFlatmapVuer_vue_vue_type_style_index_0_id_92af3352_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
8621
+ /* unused harmony reexport * */
8622
+
8623
+
8617
8624
  /***/ }),
8618
8625
 
8619
8626
  /***/ "97d3":
@@ -8642,6 +8649,17 @@ module.exports = require("@soda/get-current-script");
8642
8649
 
8643
8650
  module.exports = require("core-js/modules/es.string.iterator.js");
8644
8651
 
8652
+ /***/ }),
8653
+
8654
+ /***/ "9be4":
8655
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
8656
+
8657
+ "use strict";
8658
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_92908858_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("813c");
8659
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_92908858_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_92908858_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
8660
+ /* unused harmony reexport * */
8661
+
8662
+
8645
8663
  /***/ }),
8646
8664
 
8647
8665
  /***/ "9d7e":
@@ -9810,17 +9828,6 @@ function isKorean(text) {
9810
9828
 
9811
9829
  // extracted by mini-css-extract-plugin
9812
9830
 
9813
- /***/ }),
9814
-
9815
- /***/ "d5a7":
9816
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
9817
-
9818
- "use strict";
9819
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_65c27825_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("2804");
9820
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_65c27825_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FlatmapVuer_vue_vue_type_style_index_0_id_65c27825_prod_scoped_true_lang_scss___WEBPACK_IMPORTED_MODULE_0__);
9821
- /* unused harmony reexport * */
9822
-
9823
-
9824
9831
  /***/ }),
9825
9832
 
9826
9833
  /***/ "da6e":
@@ -9837,13 +9844,6 @@ module.exports = require("deepmerge");
9837
9844
 
9838
9845
  /***/ }),
9839
9846
 
9840
- /***/ "db06":
9841
- /***/ (function(module, exports, __webpack_require__) {
9842
-
9843
- // extracted by mini-css-extract-plugin
9844
-
9845
- /***/ }),
9846
-
9847
9847
  /***/ "db0a":
9848
9848
  /***/ (function(module, exports) {
9849
9849
 
@@ -13302,7 +13302,7 @@ if (typeof window !== 'undefined') {
13302
13302
  // Indicate to webpack that this file can be concatenated
13303
13303
  /* harmony default export */ var setPublicPath = (null);
13304
13304
 
13305
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"52da7808-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/FlatmapVuer.vue?vue&type=template&id=65c27825&scoped=true&
13305
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"52da7808-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/FlatmapVuer.vue?vue&type=template&id=92908858&scoped=true&
13306
13306
  var render = function render() {
13307
13307
  var _vm = this,
13308
13308
  _c = _vm._self._c;
@@ -13773,7 +13773,7 @@ var render = function render() {
13773
13773
  };
13774
13774
  var staticRenderFns = [];
13775
13775
 
13776
- // CONCATENATED MODULE: ./src/components/FlatmapVuer.vue?vue&type=template&id=65c27825&scoped=true&
13776
+ // CONCATENATED MODULE: ./src/components/FlatmapVuer.vue?vue&type=template&id=92908858&scoped=true&
13777
13777
 
13778
13778
  // EXTERNAL MODULE: external "core-js/modules/es.symbol.js"
13779
13779
  var es_symbol_js_ = __webpack_require__("9b22");
@@ -15289,10 +15289,10 @@ var mapResize = function mapResize(map) {
15289
15289
  var myOptions = options;
15290
15290
  if (this.mapImp) {
15291
15291
  if (myOptions) {
15292
- if (!myOptions.className) myOptions.className = "flatmapvuer-popover";
15292
+ if (!myOptions.className) myOptions.className = "custom-popup";
15293
15293
  } else {
15294
15294
  myOptions = {
15295
- className: "flatmapvuer-popover",
15295
+ className: "custom-popup",
15296
15296
  positionAtLastClick: true
15297
15297
  };
15298
15298
  }
@@ -15391,6 +15391,12 @@ var mapResize = function mapResize(map) {
15391
15391
  }
15392
15392
  }
15393
15393
  },
15394
+ restoreMapState: function restoreMapState(state) {
15395
+ if (state) {
15396
+ if (state.viewport) this.mapImp.setState(state.viewport);
15397
+ if (state.searchTerm) this.searchAndShowResult(state.searchTerm, true);
15398
+ }
15399
+ },
15394
15400
  createFlatmap: function createFlatmap(state) {
15395
15401
  var _this3 = this;
15396
15402
  if (!this.mapImp && !this.loading) {
@@ -15462,12 +15468,17 @@ var mapResize = function mapResize(map) {
15462
15468
  _this3.pathways = _this3.mapImp.pathTypes();
15463
15469
  _this3.$emit("ready", _this3);
15464
15470
  _this3.loading = false;
15465
- if (_this3._viewportToBeSet) _this3.mapImp.setState(_this3._viewportToBeSet);else if (state && state.viewport) _this3.mapImp.setState(state.viewport);
15471
+ if (_this3._stateToBeSet) _this3.restoreMapState(_this3._viewportToBeSet);else {
15472
+ _this3.restoreMapState(state);
15473
+ }
15466
15474
  });
15467
15475
  } else if (state) {
15468
15476
  if (this.entry == state.entry) {
15469
- this._viewportToBeSet = state.viewport;
15470
- if (this.mapImp && !this.loading) this.mapImp.setState(this._viewportToBeSet);
15477
+ this._stateToBeSet = {
15478
+ viewport: state.viewport,
15479
+ searchTerm: state.searchTerm
15480
+ };
15481
+ if (this.mapImp && !this.loading) this.restoreMapState(this._stateToBeSet);
15471
15482
  }
15472
15483
  }
15473
15484
  },
@@ -15478,17 +15489,24 @@ var mapResize = function mapResize(map) {
15478
15489
  this.drawerOpen = flag;
15479
15490
  },
15480
15491
  /**
15481
- * Function to display features with annotation matching the provided term.
15492
+ * Function to display features with annotation matching the provided term,
15493
+ * with the option to display the label using displayLabel flag.
15482
15494
  */
15483
- searchAndShowResult: function searchAndShowResult(term) {
15495
+ searchAndShowResult: function searchAndShowResult(term, displayLabel) {
15484
15496
  if (this.mapImp) {
15485
15497
  if (term === undefined || term === "") {
15486
15498
  this.mapImp.clearSearchResults();
15487
15499
  return true;
15488
15500
  } else {
15489
15501
  var searchResults = this.mapImp.search(term);
15490
- if (searchResults && searchResults.__featureIds.length > 0) {
15502
+ if (searchResults && searchResults.results && searchResults.results.length > 0) {
15491
15503
  this.mapImp.showSearchResults(searchResults);
15504
+ if (displayLabel && searchResults.results[0].featureId && searchResults.results[0].text) {
15505
+ this.mapImp.showPopup(searchResults.results[0].featureId, searchResults.results[0].text, {
15506
+ className: "custom-popup",
15507
+ positionAtLastClick: false
15508
+ });
15509
+ }
15492
15510
  return true;
15493
15511
  } else this.mapImp.clearSearchResults();
15494
15512
  }
@@ -15645,8 +15663,8 @@ var mapResize = function mapResize(map) {
15645
15663
  });
15646
15664
  // CONCATENATED MODULE: ./src/components/FlatmapVuer.vue?vue&type=script&lang=js&
15647
15665
  /* harmony default export */ var components_FlatmapVuervue_type_script_lang_js_ = (FlatmapVuervue_type_script_lang_js_);
15648
- // EXTERNAL MODULE: ./src/components/FlatmapVuer.vue?vue&type=style&index=0&id=65c27825&prod&scoped=true&lang=scss&
15649
- var FlatmapVuervue_type_style_index_0_id_65c27825_prod_scoped_true_lang_scss_ = __webpack_require__("d5a7");
15666
+ // EXTERNAL MODULE: ./src/components/FlatmapVuer.vue?vue&type=style&index=0&id=92908858&prod&scoped=true&lang=scss&
15667
+ var FlatmapVuervue_type_style_index_0_id_92908858_prod_scoped_true_lang_scss_ = __webpack_require__("9be4");
15650
15668
 
15651
15669
  // CONCATENATED MODULE: ./src/components/FlatmapVuer.vue
15652
15670
 
@@ -15663,14 +15681,14 @@ var FlatmapVuer_component = normalizeComponent(
15663
15681
  staticRenderFns,
15664
15682
  false,
15665
15683
  null,
15666
- "65c27825",
15684
+ "92908858",
15667
15685
  null
15668
15686
 
15669
15687
  )
15670
15688
 
15671
15689
  /* harmony default export */ var FlatmapVuer = (FlatmapVuer_component.exports);
15672
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"52da7808-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/MultiFlatmapVuer.vue?vue&type=template&id=28f8b230&scoped=true&
15673
- var MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_render = function render() {
15690
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"52da7808-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/MultiFlatmapVuer.vue?vue&type=template&id=92af3352&scoped=true&
15691
+ var MultiFlatmapVuervue_type_template_id_92af3352_scoped_true_render = function render() {
15674
15692
  var _vm = this,
15675
15693
  _c = _vm._self._c;
15676
15694
  return _c('div', {
@@ -15712,7 +15730,7 @@ var MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_render = function
15712
15730
  "popper-class": "flatmap_dropdown"
15713
15731
  },
15714
15732
  on: {
15715
- "change": _vm.flatmapChanged
15733
+ "change": _vm.setSpecies
15716
15734
  },
15717
15735
  model: {
15718
15736
  value: _vm.activeSpecies,
@@ -15781,9 +15799,9 @@ var MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_render = function
15781
15799
  });
15782
15800
  })], 2);
15783
15801
  };
15784
- var MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_staticRenderFns = [];
15802
+ var MultiFlatmapVuervue_type_template_id_92af3352_scoped_true_staticRenderFns = [];
15785
15803
 
15786
- // CONCATENATED MODULE: ./src/components/MultiFlatmapVuer.vue?vue&type=template&id=28f8b230&scoped=true&
15804
+ // CONCATENATED MODULE: ./src/components/MultiFlatmapVuer.vue?vue&type=template&id=92af3352&scoped=true&
15787
15805
 
15788
15806
  // EXTERNAL MODULE: ./node_modules/element-ui/lib/theme-chalk/popover.css
15789
15807
  var popover = __webpack_require__("06f1");
@@ -15829,6 +15847,7 @@ var es_object_keys_js_ = __webpack_require__("ea64");
15829
15847
 
15830
15848
 
15831
15849
 
15850
+
15832
15851
 
15833
15852
 
15834
15853
  /* eslint-disable no-alert, no-console */
@@ -15855,6 +15874,10 @@ var TAXON_UUID = {
15855
15874
  components: {
15856
15875
  FlatmapVuer: FlatmapVuer
15857
15876
  },
15877
+ beforeMount: function beforeMount() {
15878
+ this._resolveList = [];
15879
+ this._initialised = false;
15880
+ },
15858
15881
  mounted: function mounted() {
15859
15882
  var _this = this;
15860
15883
  this.initialise();
@@ -15872,6 +15895,7 @@ var TAXON_UUID = {
15872
15895
  fetch(_this2.flatmapAPI).then(function (response) {
15873
15896
  return response.json();
15874
15897
  }).then(function (data) {
15898
+ _this2._initialised = true;
15875
15899
  //Check each key in the provided availableSpecies against the one
15876
15900
  //on the server, add them to the Select if the key is found
15877
15901
  Object.keys(_this2.availableSpecies).forEach(function (key) {
@@ -15889,20 +15913,33 @@ var TAXON_UUID = {
15889
15913
  }
15890
15914
  }
15891
15915
  });
15892
- if (!_this2.state) {
15916
+ //Use the state species if it does not have any other species information
15917
+ var species = _this2.initial;
15918
+ if (_this2.state) {
15919
+ var mapState = _this2.state.state;
15920
+ if ((!mapState || !mapState.uuid && !mapState.entry) && _this2.state.species) species = _this2.state.species;else species = undefined;
15921
+ }
15922
+ if (species) {
15893
15923
  //No state resuming, set the current flatmap to {this.initial}
15894
- if (_this2.initial && _this2.speciesList[_this2.initial] !== undefined) {
15895
- _this2.activeSpecies = _this2.initial;
15924
+ if (species && _this2.speciesList[species] !== undefined) {
15925
+ _this2.activeSpecies = species;
15896
15926
  } else {
15897
15927
  _this2.activeSpecies = Object.keys(_this2.speciesList)[0];
15898
15928
  }
15899
- external_vue_default.a.nextTick(function () {
15900
- if (_this2.$refs[_this2.activeSpecies]) _this2.$refs[_this2.activeSpecies][0].createFlatmap();
15901
- });
15929
+ _this2.setSpecies(_this2.activeSpecies, _this2.state ? _this2.state.state : undefined, 5);
15902
15930
  }
15931
+ resolve();
15932
+ _this2._resolveList.forEach(function (other) {
15933
+ other();
15934
+ });
15903
15935
  });
15936
+ } else if (_this2._initialised) {
15937
+ //resolve as it has been initialised
15938
+ resolve();
15939
+ } else {
15940
+ //resolve when the list request has been resolved
15941
+ _this2._resolveList.push(resolve);
15904
15942
  }
15905
- resolve();
15906
15943
  });
15907
15944
  },
15908
15945
  FlatmapSelected: function FlatmapSelected(resource) {
@@ -15932,10 +15969,20 @@ var TAXON_UUID = {
15932
15969
  var map = this.getCurrentFlatmap();
15933
15970
  map.showMarkerPopup(featureId, node, options);
15934
15971
  },
15935
- flatmapChanged: function flatmapChanged(species, viewport) {
15936
- if (this.activeSpecies != species) this.activeSpecies = species;
15937
- this.$refs[this.activeSpecies][0].createFlatmap(viewport);
15938
- this.$emit('flatmapChanged', this.activeSpecies);
15972
+ setSpecies: function setSpecies(species, state, numberOfRetry) {
15973
+ var _this3 = this;
15974
+ if (this.$refs && species in this.$refs) {
15975
+ this.activeSpecies = species;
15976
+ this.$refs[this.activeSpecies][0].createFlatmap(state);
15977
+ this.$emit('flatmapChanged', this.activeSpecies);
15978
+ } else if (numberOfRetry) {
15979
+ var retry = numberOfRetry - 1;
15980
+ if (retry >= 0) {
15981
+ external_vue_default.a.nextTick(function () {
15982
+ _this3.setSpecies(species, state, retry);
15983
+ });
15984
+ }
15985
+ }
15939
15986
  },
15940
15987
  /**
15941
15988
  * Function to switch to the latest existing map from
@@ -15948,7 +15995,7 @@ var TAXON_UUID = {
15948
15995
  for (var i = 0; i < keys.length; i++) {
15949
15996
  var species = this.speciesList[keys[i]];
15950
15997
  if (!species.isLegacy && species.taxo === state.entry && species.biologicalSex === state.biologicalSex) {
15951
- this.flatmapChanged(keys[i], state);
15998
+ this.setSpecies(keys[i], state, 0);
15952
15999
  return;
15953
16000
  }
15954
16001
  }
@@ -15974,7 +16021,8 @@ var TAXON_UUID = {
15974
16021
  state: {
15975
16022
  entry: taxo,
15976
16023
  uuid: uuid,
15977
- viewport: state.state.viewport
16024
+ viewport: state.state.viewport,
16025
+ searchTerm: state.state.searchTerm
15978
16026
  }
15979
16027
  };
15980
16028
  }
@@ -15986,7 +16034,7 @@ var TAXON_UUID = {
15986
16034
  * @private
15987
16035
  */
15988
16036
  updateState: function updateState(state) {
15989
- var _this3 = this;
16037
+ var _this4 = this;
15990
16038
  return new Promise(function (resolve) {
15991
16039
  if (state && state.state) {
15992
16040
  var mapState = state.state;
@@ -15994,20 +16042,22 @@ var TAXON_UUID = {
15994
16042
  if (!mapState.uuid) {
15995
16043
  if (mapState.entry) {
15996
16044
  var uuid = mapState.entry in TAXON_UUID ? TAXON_UUID[mapState.entry] : undefined;
15997
- var newState = _this3.createLegacyEntry(state, mapState.entry, uuid);
16045
+ var newState = _this4.createLegacyEntry(state, mapState.entry, uuid);
15998
16046
  resolve(newState ? newState : state);
15999
16047
  }
16000
16048
  } else if (mapState.entry) {
16001
16049
  //uuid is in the state but should be checked if it is the latest map
16002
16050
  //for that taxon
16003
16051
  return new Promise(function () {
16004
- var mapManager = new (__webpack_require__("4979").MapManager)(_this3.flatmapAPI);
16052
+ var mapManager = new (__webpack_require__("4979").MapManager)(_this4.flatmapAPI);
16005
16053
  //mapManager.findMap_ is an async function so we need to wrap this with a promise
16006
- mapManager.findMap_({
16054
+ var identifier = {
16007
16055
  taxon: mapState.entry
16008
- }).then(function (map) {
16056
+ };
16057
+ if (mapState.biologicalSex) identifier['biologicalSex'] = mapState.biologicalSex;
16058
+ mapManager.findMap_(identifier).then(function (map) {
16009
16059
  if (map.uuid !== mapState.uuid) {
16010
- return _this3.createLegacyEntry(state, mapState.entry, mapState.uuid);
16060
+ return _this4.createLegacyEntry(state, mapState.entry, mapState.uuid);
16011
16061
  }
16012
16062
  }).then(function (newState) {
16013
16063
  resolve(newState ? newState : state);
@@ -16044,24 +16094,15 @@ var TAXON_UUID = {
16044
16094
  * @public
16045
16095
  */
16046
16096
  setState: function setState(state) {
16047
- var _this4 = this;
16097
+ var _this5 = this;
16048
16098
  if (state) {
16049
- this.initialise().then(function () {
16050
- //Update state if required
16051
- _this4.updateState(state).then(function (currentState) {
16052
- if (currentState.species && currentState.species !== _this4.activeSpecies) {
16053
- _this4.activeSpecies = currentState.species;
16054
- if (currentState.state) {
16055
- //Wait for next tick when the refs are ready for rendering
16056
- _this4.$nextTick(function () {
16057
- if (_this4.activeSpecies in _this4.$refs) {
16058
- _this4.$refs[_this4.activeSpecies][0].createFlatmap(currentState.state);
16059
- _this4.$emit('flatmapChanged', _this4.activeSpecies);
16060
- }
16061
- });
16062
- }
16099
+ //Update state if required
16100
+ this.updateState(state).then(function (currentState) {
16101
+ _this5.initialise().then(function () {
16102
+ if (currentState.species && currentState.species !== _this5.activeSpecies) {
16103
+ _this5.setSpecies(currentState.species, currentState.state, 5);
16063
16104
  } else if (currentState.state) {
16064
- var map = _this4.getCurrentFlatmap();
16105
+ var map = _this5.getCurrentFlatmap();
16065
16106
  map.setState(currentState.state);
16066
16107
  }
16067
16108
  });
@@ -16195,8 +16236,8 @@ var TAXON_UUID = {
16195
16236
  });
16196
16237
  // CONCATENATED MODULE: ./src/components/MultiFlatmapVuer.vue?vue&type=script&lang=js&
16197
16238
  /* harmony default export */ var components_MultiFlatmapVuervue_type_script_lang_js_ = (MultiFlatmapVuervue_type_script_lang_js_);
16198
- // EXTERNAL MODULE: ./src/components/MultiFlatmapVuer.vue?vue&type=style&index=0&id=28f8b230&prod&scoped=true&lang=scss&
16199
- var MultiFlatmapVuervue_type_style_index_0_id_28f8b230_prod_scoped_true_lang_scss_ = __webpack_require__("126f");
16239
+ // EXTERNAL MODULE: ./src/components/MultiFlatmapVuer.vue?vue&type=style&index=0&id=92af3352&prod&scoped=true&lang=scss&
16240
+ var MultiFlatmapVuervue_type_style_index_0_id_92af3352_prod_scoped_true_lang_scss_ = __webpack_require__("9418");
16200
16241
 
16201
16242
  // CONCATENATED MODULE: ./src/components/MultiFlatmapVuer.vue
16202
16243
 
@@ -16209,11 +16250,11 @@ var MultiFlatmapVuervue_type_style_index_0_id_28f8b230_prod_scoped_true_lang_scs
16209
16250
 
16210
16251
  var MultiFlatmapVuer_component = normalizeComponent(
16211
16252
  components_MultiFlatmapVuervue_type_script_lang_js_,
16212
- MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_render,
16213
- MultiFlatmapVuervue_type_template_id_28f8b230_scoped_true_staticRenderFns,
16253
+ MultiFlatmapVuervue_type_template_id_92af3352_scoped_true_render,
16254
+ MultiFlatmapVuervue_type_template_id_92af3352_scoped_true_staticRenderFns,
16214
16255
  false,
16215
16256
  null,
16216
- "28f8b230",
16257
+ "92af3352",
16217
16258
  null
16218
16259
 
16219
16260
  )