Commit c037a34c authored Apr 06, 2020 by Kaitlyn

Merge branch 'master' of github.com:CartoCosmos/CartoCosmos into testing

parents bf371c69 aad31320

app/src/js/AstroMap.js

+8 −4

Original line number	Diff line number	Diff line
		@@ -158,10 +158,14 @@ export default L.Map.AstroMap = L.Map.extend({
		* @param {List} center - Center of map based off of projection.
		*/
		changeProjection: function(name, center) {
		if (this._currentProj == "EPSG:4326") {
		// Reset the view before changing the projection since
		// an exception may be thrown when swapping to a polar
		// projection and the zoom level is 7+.
		// projection from cylindrcal and the zoom level is 7+.
		// proj has trouble unprojecting points in cylindrical
		// at such a high zoom level.
		this.setView(center, 1, true);
		}

		let newCRS = null;
		if (name == "cylindrical") {

app/src/js/LayerCollection.js

+3 −3

Original line number	Diff line number	Diff line
		@@ -125,9 +125,9 @@ export default L.LayerCollection = L.Class.extend({
		L.LayerCollection.layerControl.addTo(map);
		}

		if (this._projName == "cylindrical") {
		this.loadWFS(map);
		}
		// if (this._projName == "cylindrical") {
		// this.loadWFS(map);
		// }
		},

		/**

app/src/js/MousePosition.js

+2 −7

Original line number	Diff line number	Diff line
		@@ -136,14 +136,9 @@ export default L.Control.MousePosition = L.Control.extend({
		lng = this.astroMath.domainToPositiveWest(lng, this.isLonDom180);
		}

		lng = L.Util.formatNum(lng, this.options.numDigits);
		lat = L.Util.formatNum(lat, this.options.numDigits);
		lng = lng.toFixed(this.options.numDigits);
		lat = lat.toFixed(this.options.numDigits);

		//const value = this.options.lngFirst
		//? lng + this.options.separator + lat
		//: lat + this.options.separator + lng;

		//const prefixAndValue = `${this.options.prefix}${value}`;
		this.lonDisplayElement.innerHTML = lng;
		this.latDisplayElement.innerHTML = lat;
		} else {