Commit 4753b331 authored by Laura, Jason R's avatar Laura, Jason R
Browse files

Merge branch 'NoWrap' into 'main' 

Temporary Fix to longitude issues discovered with noWrap Implementation

See merge request asc/geostac!8
parents d6fa70d4 9dc88857

src/components/presentational/ConsoleLonLatSelects.jsx

+5 −2
Original line number Diff line number Diff line
@@ -189,14 +189,17 @@ export default function ConsoleLonLatSelects() { 
              <ToggleButton

                id="consoleLon180Btn"

                value={180}

                color="primary">

                color="primary"

                disabled={true}

                selected={false}>

                <ExposureIcon fontSize="small" />

                <Typography sx={css.buttonText}>180&deg;</Typography>

              </ToggleButton>

              <ToggleButton

                id="consoleLon360Btn"

                value={360}

                color="primary">

                color="primary"

                selected={true}>

                <AddBoxIcon fontSize="small" />

                <Typography sx={css.buttonText}>360&deg;</Typography>

              </ToggleButton>

src/js/AstroMap.js

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import { MY_JSON_MAPS } from "./layers"; 
 */

export default L.Map.AstroMap = L.Map.extend({

  options: {

    center: [0, 0],

    center: [0, 180],

    zoom: 1,

    maxZoom: 8,

    attributionControl: false,
@@ -101,6 +101,7 @@ export default L.Map.AstroMap = L.Map.extend({ 
    L.Map.prototype.initialize.call(this, this._mapDiv, this.options);

    this.loadLayerCollection("cylindrical");

    



    setCurrentPage(1);

    this.loadFootprintLayer(target, "?page=1");

src/js/LayerCollection.js

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ export default L.LayerCollection = L.Class.extend({ 
        String(layer["url"]) + "?map=" + String(layer["map"]),

        {

          layers: String(layer["layer"]),

          noWrap: true

          noWrap: true,

          bounds: [[[-90, 360], [90, 0]]]

        }

      );

      let name = String(layer["displayname"]);
@@ -68,7 +69,8 @@ export default L.LayerCollection = L.Class.extend({ 
          layers: String(layer["layer"]),

          transparent: true,

          format: "image/png",

          noWrap: true

          noWrap: true,

          bounds: [[-90, 360], [90, 0]]

        }

      );

      let name = String(layer["displayname"]);

src/js/MousePositionControl.js

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ export default L.Control.MousePositionControl = L.Control.extend({ 


    this.map = map;



    this.isLonDom180 = true;

    this.isLonDom180 = false;

    this.isLatTypeOcentric = true;

    this.isLonDirEast = true;