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

Adding popup_attribute to the GeoJson feature #376

Closed
wants to merge 10 commits into from

Commits on Feb 29, 2016

  1. Add the popup_attribute to the GeoJson feature

    The popup_attribute takes an attribute name and uses the attribute as the popup value for each feature in the layer.
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Feb 29, 2016
    Copy the full SHA
    14da52e View commit details
    Browse the repository at this point in the history
  2. Update examples for the popup_attribute

    Update to the GeoJson and GeoPandas examples to include the popup attribute
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Feb 29, 2016
    Copy the full SHA
    0c2429c View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2016

  1. Update popup_attribute to popup_function

    Update the geojson popup attribute to being a popup function which will build a _popupContent attribute on features if required.
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 1, 2016
    Copy the full SHA
    3747c56 View commit details
    Browse the repository at this point in the history
  2. Add tests for geojson popup

    Test on the attribute being correct and the geojson producing correctly, and test on the function creating the correct _popupContent attribue on the feature.
    
    Also update test_geo_json_str so that it includes the empty options parameters.
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 1, 2016
    Copy the full SHA
    0729193 View commit details
    Browse the repository at this point in the history
  3. Drop the popup_function into choropleth

    Allow passing the popup_function through the choropleth shortcut on the map object (assuming the dataset is GeoJson)
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 1, 2016
    Copy the full SHA
    874aefd View commit details
    Browse the repository at this point in the history
  4. Example notebooks include popup_function

    Update the notebooks to include a popup function for GeoJson and GeoDataFrames
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 1, 2016
    Copy the full SHA
    54bf3dc View commit details
    Browse the repository at this point in the history
  5. Remove the extra line causing travis to fail

    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 1, 2016
    Copy the full SHA
    828d0f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2016

  1. Move popup_function use to style_data method

    The actual population of the `_popupContent` attribute based on popup_function is now in the style attribute. This means that the `popup_function` and `popup_attribute` can be populated after the Geojson creation.
    
    The `popup_function` is actually a feature property now to ensure that the `popup_attribute` is set correctly when the function is set after the fact.
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 8, 2016
    Copy the full SHA
    3f8ff48 View commit details
    Browse the repository at this point in the history
  2. Update geojson examples

    Update the geojson examples to show the popup attribute and function can be set after the fact on geojson features.
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 8, 2016
    Copy the full SHA
    abca6b5 View commit details
    Browse the repository at this point in the history
  3. Fix comment to fix travis

    Fix the indent to fix the comment that fails the travis build
    
    Signed-off-by: Henry Walshaw <henry.walshaw@gmail.com>
    om-henners committed Mar 8, 2016
    Copy the full SHA
    bcb72b1 View commit details
    Browse the repository at this point in the history