- 
                Notifications
    You must be signed in to change notification settings 
- Fork 361
Adapt heatmap layer to be used with a colormap control #1036
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
          
     Open
      
      
            HaudinFlorence
  wants to merge
  13
  commits into
  jupyter-widgets:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
HaudinFlorence:adapt_Heatmap_layer_to_be_used_with_a_ColormapControl
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
  
     Open
                    Changes from 5 commits
      Commits
    
    
            Show all changes
          
          
            13 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      9c2efed
              
                Adapt Heatmap layer for an easier use with a ColormapControl.
              
              
                HaudinFlorence e8bbcc0
              
                Fix flake8 formatting issue.
              
              
                HaudinFlorence 93fa3c4
              
                Simplify the logics of attributes of Heatmap class and compute vmin, …
              
              
                HaudinFlorence 92ff447
              
                Update docstrings and change self.values/self.colors into values/colo…
              
              
                HaudinFlorence 8675531
              
                Update obsolete argument in @observe decorator.
              
              
                HaudinFlorence b3d0cd5
              
                Update ipyleaflet/leaflet.py
              
              
                HaudinFlorence 0e186d1
              
                Update ipyleaflet/leaflet.py
              
              
                HaudinFlorence 6f8773e
              
                Update obsolete argument in @observe decorator.
              
              
                HaudinFlorence e1674ce
              
                Add index argument in LinearColormap to properly set a piecewise line…
              
              
                HaudinFlorence 27acdac
              
                Change values to colormap_labels in _get_data method .
              
              
                HaudinFlorence 373f5d9
              
                Sort the gradient to be compatible with the colormap treating with or…
              
              
                HaudinFlorence ec2e2a8
              
                Update ipyleaflet/leaflet.py
              
              
                HaudinFlorence f6f10a5
              
                Remove comment and unsorted gradient and fix flake8 issue.
              
              
                HaudinFlorence File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| { | ||
| "cells": [ | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "98958552-db61-4b15-9025-8483234118b3", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "# Set up for JupyterLite\n", | ||
| "try:\n", | ||
| " import piplite\n", | ||
| " await piplite.install('ipyleaflet')\n", | ||
| "except ImportError:\n", | ||
| " pass" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "974bc9b2-4a25-455b-8c4d-ca565e21f146", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "import ipyleaflet\n", | ||
| "from random import uniform\n", | ||
| "import time\n", | ||
| "from branca.colormap import linear, LinearColormap" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "fa27e0da-7047-4f06-93e8-3fb230e554d4", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "def create_random_data(length):\n", | ||
| " \"Return a list of some random lat/lon/value triples.\"\n", | ||
| " return [\n", | ||
| " [uniform(-80, 80), uniform(-180, 180), uniform(0, 1000)] for i in range(length)\n", | ||
| " ]" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "id": "cd1fc9dd-addf-4085-95ff-b8d4b983491f", | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "m = ipyleaflet.Map(center=[0, 0], zoom=2)\n", | ||
| "heat = ipyleaflet.Heatmap(locations=create_random_data(1000), radius=20, blur=10, gradient={0.25 : 'orange', 0.85 : 'red'})\n", | ||
| "colormap_control = ipyleaflet.ColormapControl(\n", | ||
| " caption='Intensity',\n", | ||
| " colormap=heat.colormap,\n", | ||
| " value_min=heat.vmin,\n", | ||
| " value_max=heat.vmax,\n", | ||
| " position='topright',\n", | ||
| " transparent_bg=True,\n", | ||
| " )\n", | ||
| "m.add(heat)\n", | ||
| "m.add(colormap_control)" | ||
| ] | ||
| } | ||
| ], | ||
| "metadata": { | ||
| "kernelspec": { | ||
| "display_name": "Python 3 (ipykernel)", | ||
| "language": "python", | ||
| "name": "python3" | ||
| }, | ||
| "language_info": { | ||
| "codemirror_mode": { | ||
| "name": "ipython", | ||
| "version": 3 | ||
| }, | ||
| "file_extension": ".py", | ||
| "mimetype": "text/x-python", | ||
| "name": "python", | ||
| "nbconvert_exporter": "python", | ||
| "pygments_lexer": "ipython3", | ||
| "version": "3.9.13" | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 5 | ||
| } | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
|  | @@ -8,7 +8,7 @@ | |
| import xyzservices | ||
| from datetime import date, timedelta | ||
| from math import isnan | ||
| from branca.colormap import linear, ColorMap | ||
| from branca.colormap import linear, LinearColormap, ColorMap | ||
| from IPython.display import display | ||
| import warnings | ||
|  | ||
|  | @@ -799,8 +799,14 @@ class Heatmap(RasterLayer): | |
| Radius of the data points. | ||
| blur: float, default 15. | ||
| Blurring intensity. | ||
| gradient: dict, default {0.4: 'blue', 0.6: 'cyan', 0.7: 'lime', 0.8: 'yellow', 1.0: 'red'} | ||
| gradient : Dict, default {0.4: 'blue', 0.6: 'cyan', 0.7: 'lime', 0.8: 'yellow', 1.0: 'red'} | ||
| Colors used for the color-mapping from low to high heatmap intensity. | ||
| vmin : float, default 0.4 | ||
| Minimum value of the color mapping | ||
| vmax : float, default 1.0 | ||
| Maximum value of the color mapping | ||
| colormap: branca.colormap.LinearColorMap instance | ||
| The colormap used for displaying the HeatMap data, defined with the same min and max values and colors than the gradient. | ||
| """ | ||
|  | ||
| _view_name = Unicode('LeafletHeatmapView').tag(sync=True) | ||
|  | @@ -816,6 +822,21 @@ class Heatmap(RasterLayer): | |
| blur = Float(15.0).tag(sync=True, o=True) | ||
| gradient = Dict({0.4: 'blue', 0.6: 'cyan', 0.7: 'lime', 0.8: 'yellow', 1.0: 'red'}).tag(sync=True, o=True) | ||
|  | ||
| def __init__(self, **kwargs): | ||
| super(Heatmap, self).__init__(**kwargs) | ||
| self.data = self._get_data() | ||
|  | ||
| @observe('gradient') | ||
| def _updata_data(self, change): | ||
| self.data = self._get_data() | ||
|  | ||
| def _get_data(self): | ||
| values = list(self.gradient.keys()) | ||
| colors = list(self.gradient.values()) | ||
| self.vmin = values[0] | ||
| self.vmax = values[len(values) - 1] | ||
|         
                  HaudinFlorence marked this conversation as resolved.
              Outdated
          
            Show resolved
            Hide resolved | ||
| self.colormap = LinearColormap(colors, vmin=self.vmin, vmax=self.vmax) | ||
|          | ||
|  | ||
|  | ||
| class VectorTileLayer(Layer): | ||
| """VectorTileLayer class, with Layer as parent class. | ||
|  | ||
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.