Commit 32b04f6d authored by Gavin's avatar Gavin
Browse files

added filters to query

parent 73441b1c

app/Miniconda3.sh

0 → 100644
+63.6 MiB

File added.

No diff preview for this file type.

View file

app/src/components/container/App.jsx

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ const useStyles = makeStyles(theme => ({ 
 */

export default function App() {

  const classes = useStyles();

  const [targetPlanet, setTargetPlanet] = React.useState("Mercury");

  const [targetPlanet, setTargetPlanet] = React.useState("Mars");



  /**

   * Handles target selection

app/src/components/presentational/SearchAndFilterInput.jsx

+7 −4
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ export default function SearchAndFilterInput() { 
    // dateDetails.current.open = false;

  }





  

  // Sorting

  const handleSortChange = (event) => {

    setSortVal(event.target.value);
@@ -270,25 +272,26 @@ export default function SearchAndFilterInput() { 
                  <div className="panelSectionCheck"><Checkbox id="dateCheckBox" checked={dateCheckVal} onChange={handleDateCheckChange}/></div>

                </div>

              </summary>

              <div className="panelItem">

              <div className="panelItem" id="dateFromDiv">

                <LocalizationProvider dateAdapter={AdapterDateFns}>

                  <DatePicker

                    class="testing123"

                    id="dateFromPicker"

                    label="From"

                    value={dateFromVal}

                    onChange={handleDateFromChange}

                    renderInput={(params) => <TextField {...params} />}

                    renderInput={(params) => <TextField id="fromtest" {...params} />}

                  />

                </LocalizationProvider>

              </div>

              <div className="panelItem">

              <div className="panelItem" id="dateToDiv">

                <LocalizationProvider dateAdapter={AdapterDateFns}>

                  <DatePicker

                    id="dateToPicker"

                    label="To"

                    value={dateToVal}

                    onChange={handleDateToChange}

                    renderInput={(params) => <TextField {...params} />}

                    renderInput={(params) => <TextField id="totest"{...params} />}

                  />

                </LocalizationProvider>

              </div>

app/src/js/AstroDrawControl.js

+30 −31
Original line number Diff line number Diff line 
import L from "leaflet";

import "leaflet-draw";

import Wkt from "wicket";



/**

 * @class AstroDrawControl

 * @aka L.Control.AstroDrawControl

app/src/js/AstroMap.js

+67 −4
Original line number Diff line number Diff line 
import L from "leaflet";

import "proj4leaflet";



import AstroProj from "./AstroProj";

import LayerCollection from "./LayerCollection";

import { getItemCollection, url } from "./ApiJsonCollection";

import { MY_JSON_MAPS } from "./layers";

import "leaflet-html-legend";

import React from "react";



/**

 * @class AstroMap
@@ -105,6 +105,70 @@ export default L.Map.AstroMap = L.Map.extend({ 
    this.on("baselayerchange", function(e) {

      this.setCurrentLayer(e["layer"]);

    });



    L.DomEvent.on(L.DomUtil.get("applyButton"), "click", function() {

      let filterOptions = [];



      if (L.DomUtil.get("dateCheckBox").checked == true) {

        let fromDate = L.DomUtil.get("fromtest").value;

        let toDate = L.DomUtil.get("totest").value;

        fromDate = fromDate.split("/");

        toDate = toDate.split("/");



        let newFromDate = "";

        newFromDate = newFromDate.concat(

          fromDate[2],

          "-",

          fromDate[0],

          "-",

          fromDate[1],

          "T00:00:00Z"

        );



        let newToDate = "";

        newToDate = newToDate.concat(

          toDate[2],

          "-",

          toDate[0],

          "-",

          toDate[1],

          "T23:59:59Z"

        );

        let timeQuery = "".concat("datetime=", newFromDate, "/", newToDate);

        filterOptions.push(timeQuery);

      }



      if (L.DomUtil.get("keywordCheckBox").checked == true) {

        filterOptions.push(L.DomUtil.get("keywordTextBox").value);

      }



      // if (L.DomUtil.get("keywordCheckBox").checked == true) {

      //   filterOptions.push(L.DomUtil.get("keywordTextBox").value);

      // }



      // if (L.DomUtil.get("keywordCheckBox").checked == true) {

      //   filterOptions.push(L.DomUtil.get("keywordTextBox").value);

      // }



      let queryString = "";



      for (let i = 0; i < filterOptions.length; i++) {

        if (queryString == "") {

          queryString = queryString.concat("?", filterOptions[i]);

        } else {

          queryString = queryString.concat("&", filterOptions[i]);

        }

      }

      // re render map

      console.log(queryString);

      self.clearLayers();

      self.removeControl(this.htmllegend);

      self.loadFootprintLayer(this._name, queryString);

    });



    L.DomEvent.on(L.DomUtil.get("clearButton"), "click", function() {

      alert("clearing map");

    });

  },



  /**
@@ -152,7 +216,6 @@ export default L.Map.AstroMap = L.Map.extend({ 
    });

  },





  /**

   * @function AstroMap.prototype.addFootprintLegend

   * @description Adds legend for each footprint layer