Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Add sensibility management #324

Closed
wants to merge 24 commits into from

Commits on Jul 26, 2021

  1. feat(map): Add layerGroups by id_type

    Add layerGroups to the map for the user to be able to filter
    along the different cells (Department, cities, 10km, 1km)
    Added id_type to all queries to be able to filter along this
    property
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    c571627 View commit details
    Browse the repository at this point in the history
  2. feat(map): Zoom, snogylop and features

    Correct zoom function to work on all "fiches" by adding a
    zoomMaille function
    Added snogylop to ficheCommune.html and invert: true in style of
    map
    Changed layerGroup by featureGroup to have bringToBack and
    bringToFront functions
    Add bringToFront and bringToBack to respectively the 1km² cell and
    the department because it was impossible to click on a city cell
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    56dac33 View commit details
    Browse the repository at this point in the history
  3. feat(map): Updated sql to match db modifications

    Changed the sql files to be able to reproduce the changes done on
    the database.
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    16f83aa View commit details
    Browse the repository at this point in the history
  4. style(map): add hover and click effect

    Tested if it was possible to add hover and click effect to
    hightlight a specific cell.
    Added ZIndex values for the filter to be more robust
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    15e5bff View commit details
    Browse the repository at this point in the history
  5. refactor: changed lastObservationsCommuneMaille

    Beforehand the lastObservationsCommuneMaille selected from
    the vm_observations which was not coherent. Now it selects from
    vm_observations_mailles.
    Add columns to select and removed the last_obs intermediate
    Enabled to get the id of the cell and its type.
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    fd8c979 View commit details
    Browse the repository at this point in the history
  6. style: improved style function and changed colors

    Cells border color is now grey
    Made styleMailleClickedOrHover more versatile
    styleMailleClickedOrHover now takes the --main-color css var to
    fill the cells with the main color of the atlas
    Removed setZIndex because it was useless
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    bc3a976 View commit details
    Browse the repository at this point in the history
  7. style: Add main-color-rgb to liste espece

    Added a new var (main-color-rgb) which is the same as main-color
    variable but with a rgb description enabling to set different
    opacity depending on the state (hover or click) of the row in
    the tabEspece
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    eb2c73e View commit details
    Browse the repository at this point in the history
  8. feat: better layering and click management

    Now the layers stack properly when the user activate or deactivate
    them from the Control (top hand right corner).
    Add a selected variable enabling the clicked cell to stay filled
    even if the mouse exits the cell (mouseout event called)
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    246639e View commit details
    Browse the repository at this point in the history
  9. style: removed unsused css directive added before

    Before was used to find a way to set background opacity other
    than by using rgb formulation
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    c05b02f View commit details
    Browse the repository at this point in the history
  10. style: forgot to put back rgba for tabEspece.hover

    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    59146e5 View commit details
    Browse the repository at this point in the history
  11. fix: corrected sql query and corrected id_type

    Sql query was from vm_observations whereas we are in
    a Maille function so it should be from vm_observations_maille
    Corrected a copy paste mistake on id_type
    Added dateobs in lastObservationsCommune
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    f847c92 View commit details
    Browse the repository at this point in the history
  12. refactor: add function to gather better city obs

    The older function took oservations based on Insee whereas it
    should take info from the observations requested before. This new
    function is based on the observations dictionnary that is
    computed from the vm_observations (maille or not) and take the
    taxons info
    Used this function in atlasRoutes.py
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    0482100 View commit details
    Browse the repository at this point in the history
  13. feat: worked on communes to make the sensi work

    mapHome.js: Clarified code
    mapGenerator.js: Move control layer bloc for  more clarity as well
      Added id_type in property for geojson of commune
      Corrected a bug by added addTo(map) in displayMailleLayerLastObs
    mapHome.js: simplified code
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    c0a66e8 View commit details
    Browse the repository at this point in the history
  14. fix: removed unused import

    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    f9aa473 View commit details
    Browse the repository at this point in the history
  15. chore: remove useless case

    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    1e43d77 View commit details
    Browse the repository at this point in the history
  16. fix(sql): returns the date object, not a str

    To be compatible with the new get_taxons_from_obs function, the
    date object must be returned and not an str conversion
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    dc551be View commit details
    Browse the repository at this point in the history
  17. fix(sql): corrected bug when no species are found

    The function crashed when there were no taxons in a particular
    city. Changed also the request for it to be more versatile in
    terms of cd_ref (bugged when there was one taxon)
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    f85ef5b View commit details
    Browse the repository at this point in the history
  18. feat(sql): Changed vm to be compatible with sensib

    atlas.sql:
       add centroid to vm_observations to be compatible with point
       mode
       Changed st_contains by st_intersect as mentionned in an issue
    observations_mailles.sql:
       Changed tables where to take infos
       Make this vm independant from vm_observations
       Removed index since it take to much space
    atlas_synthese.sql:
       Changed index since it was not working with observations that
       do not have type_code
       Returns Point when there is no sensibility instead of a mesh
       cell
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    ec88d60 View commit details
    Browse the repository at this point in the history
  19. style(species): Add css variable for species tab

    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    5e91d4f View commit details
    Browse the repository at this point in the history
  20. fix(map): bump leaflet version and rm snogilop

    Need to update leaflet for bringToFront/BringToBack to work
    Remove dependency to snogilop (had to test for compatibility)
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    c486cdc View commit details
    Browse the repository at this point in the history
  21. style(species): add rgb equivalent primary color

    To be able to alter the background transparency of the species
    list on the main page, we need to have a rgb color. Indeed rgba()
    css function does not work on hexadecimal colors. It adds complexity
    but this seems to be the only way
    Maxime Vergez committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    79218de View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2021

  1. fix(species): Corrected a city bug in FicheEspece

    In FicheEspece: the displayed cities were not right. There was no
    instersection between the observation and the cities. Now for
    instance, for a department level observation all the cities in the
    department will appear...
    Maxime Vergez committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    0a644cf View commit details
    Browse the repository at this point in the history
  2. feat(popup): Removes duplicates in popup

    In popup showing species, removes duplicates so that only different
    species are displayed
    Maxime Vergez committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    1163790 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2021

  1. feat(sql): observations_maille.sql is more robust

    Changed the plain id number to a Select with a Like to enter
    directly the mesh cell type
    It might be a parameter in the settings.ini in the future
    Maxime Vergez committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    358bd88 View commit details
    Browse the repository at this point in the history