Skip to content

Commit

Permalink
Merge branch 'dev-2.18' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
laurenwalker committed Jan 25, 2022
2 parents 6291705 + 3b93a1e commit fbe2bab
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/js/views/DataCatalogView.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ define(["jquery",
// so we don't lose state, rather use .setElement(). Delegate rendering
// and event handling to sub views
render: function () {

// Which type of map are we rendering, Google maps or Cesium maps?
this.mapType = MetacatUI.appModel.get("dataCatalogMap") || "google";

Expand Down Expand Up @@ -1890,7 +1890,7 @@ define(["jquery",
}

// Continue with rendering Google maps, if that is configured mapType

// Get the map options and create the map
gmaps.visualRefresh = true;
var mapOptions = this.mapModel.get("mapOptions");
Expand Down Expand Up @@ -2185,7 +2185,7 @@ define(["jquery",
if (this.mapType !== "google") {
return
}

// Exit if maps are not in use
if ((this.mode != "map") || (!gmaps)) {
return false;
Expand Down Expand Up @@ -2857,7 +2857,7 @@ define(["jquery",
//--First map all the results--
if (gmaps && this.mapModel) {
// Draw all the tiles on the map to represent the datasets
// this.drawTiles();
this.drawTiles();

// Remove the loading styles from the map
$("#map-container").removeClass("loading");
Expand Down

0 comments on commit fbe2bab

Please sign in to comment.