Merge branch 'master' into adding_pre_commit

Author: Riverfount

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203, W503

.github/workflows/ci.yaml

@@ -3,7 +3,6 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-
   test:
     runs-on: ubuntu-latest
     strategy:
@@ -21,26 +20,12 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.2
-
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            poetry-${{ hashFiles('**/poetry.lock') }}
-
-      - name: Set Poetry config
-        run: |
-          poetry config virtualenvs.in-project false
-          poetry config virtualenvs.path ~/.virtualenvs
-
       - name: Install Dependencies
-        run: poetry install
-        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
 
       - name: Code Quality
-        run: poetry run black . -l 80 --check
+        run: |
+          pip install black
+          black -l 80 --check

Changlog.md

@@ -2,6 +2,17 @@ Changelog
 =========
 
 
+0.4.1 (2020-02-21)
+------------
+- Added support for marker labels [jackcarter]
+- Added KML layer: User can add hyperlink of KML file to apply on the map [bhuveshsharma09]
+- Added Bicycle lane layer: User can turn on/off bicycle lane using the new attribute [bhuveshsharma09]
+- Added Custom Styles: User can add custom style JSON file for the map style [bhuveshsharma09]
+- Validated the lat lng coordinates when initialize the Map object [JacobGeoGeek]
+- Added map id support [markmelnic]
+- Updated some dependencies [Vicente Marçal]
+
+
 0.4.0 (2020-02-21)
 ------------
 - Added Trafficlayer support [wimpruijsers]

Makefile

@@ -1,11 +1,14 @@
-.PHONY: test pep8 clean install build publish tree env
+.PHONY: test pep8 types clean install build publish tree env
 
 test: pep8
 	py.test --cov=flask_googlemaps -l --tb=short --maxfail=1 tests/
 
 pep8:
 	@flake8 flask_googlemaps --ignore=F403
 
+types:
+	@mypy --py2 flask_googlemaps
+
 clean:
 	@find ./ -name '*.pyc' -exec rm -f {} \;
 	@find ./ -name 'Thumbs.db' -exec rm -f {} \;

README.md

@@ -1,13 +1,12 @@
 # Flask Google Maps [![Generic badge](https://img.shields.io/badge/PayPal-Donante-red.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2UGZHBYZV39XY&source=url)
 
-
 [![Flask Estension](https://img.shields.io/badge/flask-extension-green.svg?style=flat)](https://flaskextensions.com)
 [![PyPI version fury.io](https://badge.fury.io/py/flask-googlemaps.svg)](https://pypi.python.org/pypi/flask-googlemaps/)
 [![PyPI download month](https://img.shields.io/pypi/dm/flask-googlemaps.svg)](https://pypi.org/project/flask-googlemaps/)
 [![PyPI license](https://img.shields.io/pypi/l/flask-googlemaps.svg)](https://pypi.python.org/pypi/flask-googlemaps/)
 [![PyPI format](https://img.shields.io/pypi/format/flask-googlemaps.svg)](https://pypi.python.org/pypi/flask-googlemaps/)
 [![PyPI status](https://img.shields.io/pypi/status/flask-googlemaps.svg)](https://pypi.python.org/pypi/flask-googlemaps/)
-[![PyPI pyversions](https://img.shields.io/pypi/pyversions/flask-googlemaps.svg)](https://pypi.python.org/pypi/flask-googlemaps/)
+[![CI-Github](https://github.com/flask-extensions/Flask-GoogleMaps/workflows/CI/badge.svg)](https://github.com/flask-extensions/Flask-GoogleMaps/workflows/CI/badge.svg)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 
 Easy to use Google Maps in your Flask application
@@ -30,6 +29,7 @@ poetry shell # activate virtualenv
 poetry install  # to install all for dev
 pre-commit install # to install pre-commit hooks
 ```
+
 ## Installation
 
 To use in your project just use your dependency manager to install it, with pip is like this:
@@ -42,7 +42,6 @@ pip install flask-googlemaps
 
 Flask-GoogleMaps includes some global functions and template filters in your Jinja environment, also it allows you to use the Map in views if needed.
 
-
 ### registering
 
 in your app
@@ -68,21 +67,17 @@ GoogleMaps(app, key="8JZ7i18MjFuM35dJHq70n3Hx4")
 In template
 
 ```html
-
-{{googlemap("my_awesome_map", lat=0.23234234, lng=-0.234234234, markers=[(0.12, -0.45345), ...])}}
-
+{{googlemap("my_awesome_map", lat=0.23234234, lng=-0.234234234, markers=[(0.12,
+-0.45345), ...])}}
 ```
 
 That's it! now you have some template filters and functions to use, more details in examples and screenshot below.
 
-
-
 ### Usage
 
 - You can create the map in the view and then send to the template context
 - you can use the template functions and filters directly
 
-
 #### 1. View
 
 ```python
@@ -132,11 +127,11 @@ if __name__ == "__main__":
 ##### `Map()` Parameters
 
 - **lat**: The latitude coordinate for centering the map.
-- **lng**: The longitutde coordinate for centering the map.
+- **lng**: The longitude coordinate for centering the map.
 - **zoom**: The zoom level. Defaults to `13`.
 - **maptype**: The map type - `ROADMAP`, `SATELLITE`, `HYBRID`, `TERRAIN`. Defaults to `ROADMAP`.
-- **markers**: Markers array of tuples having (**lat**, **lng**, infobox, icon). Defaults to `None`.
-- or **markers**: a list of dicts containing **icon, lat, lng, infobox**.
+- **markers**: Markers array of tuples having (**lat**, **lng**, infobox, icon, label). Defaults to `None`.
+- or **markers**: a list of dicts containing **lat**, **lng**, infobox, icon, label.
 - or **markers**: Markers dictionary with icon urls as keys and markers array as values.
 - **varname**: The instance variable name.
 - **style**: A string containing CSS styles. Defaults to `"height:300px;width:300px;margin:0;"`.
@@ -155,50 +150,47 @@ Also controls True or False:
 - rotate_control
 - fullscreen_control
 - scroll_wheel
-- collapsible (map collapses by click on **varname**_collapse button)
+- collapsible (map collapses by click on **varname**\_collapse button)
+- mapdisplay (show a collapsible map by default or not)
 - center_on_user_location (using HTML5 Geolocation)
 
 #### 2. Template
 
 ```html
-
 <!DOCTYPE html>
-    <html>
-    <head>
-            {{"decoupled-map"|googlemap_js(37.4419, -122.1419, markers=[(37.4419, -122.1419)])}}
-            {{mymap.js}}
-            {{sndmap.js}}
-    </head>
-    <body>
-        <h1>Flask Google Maps Example</h1>
-
-        <h2> Template function centered, no marker </h2>
-        {{googlemap("simple-map", 37.4419, -122.1419)}}
-
-        <h2> Template filter decoupled with single marker </h2>
-        {{"decoupled-map"|googlemap_html(37.4419, -122.1419)}}
-
-        <h2> Template function with multiple markers </h2>
-        {% with map=googlemap_obj("another-map", 37.4419, -122.1419, markers=[(37.4419, -122.1419), (37.4300, -122.1400)]) %}
-            {{map.html}}
-            {{map.js}}
-        {% endwith %}
-
-        <h2> First map generated in view</h2>
-        {{mymap.html}}
-
-        <h2> Second map generated in view</h2>
-        <h3> Example for different icons in multiple markers with infoboxes</h3>
-        {{sndmap.html}}
-
-    </body>
+<html>
+  <head>
+    {{"decoupled-map"|googlemap_js(37.4419, -122.1419, markers=[(37.4419,
+    -122.1419)])}} {{mymap.js}} {{sndmap.js}}
+  </head>
+  <body>
+    <h1>Flask Google Maps Example</h1>
+
+    <h2>Template function centered, no marker</h2>
+    {{googlemap("simple-map", 37.4419, -122.1419)}}
+
+    <h2>Template filter decoupled with single marker</h2>
+    {{"decoupled-map"|googlemap_html(37.4419, -122.1419)}}
+
+    <h2>Template function with multiple markers</h2>
+    {% with map=googlemap_obj("another-map", 37.4419, -122.1419,
+    markers=[(37.4419, -122.1419), (37.4300, -122.1400)]) %} {{map.html}}
+    {{map.js}} {% endwith %}
+
+    <h2>First map generated in view</h2>
+    {{mymap.html}}
+
+    <h2>Second map generated in view</h2>
+    <h3>Example for different icons in multiple markers with infoboxes</h3>
+    {{sndmap.html}}
+  </body>
 </html>
-
 ```
 
 ### Infobox
 
 Here's an example snippet of code:
+
 ```python
 
     Map(
@@ -232,6 +224,39 @@ Here's an example snippet of code:
 Which results in something like the following map:
 <img width="1439" alt="screen shot 2015-07-29 at 2 41 52 pm" src="https://cloud.githubusercontent.com/assets/8108300/8969650/13b0de7a-3602-11e5-9ed0-9f328ac9253f.png">
 
+### Label
+
+Here's an example snippet of code:
+```python
+
+Map(
+        identifier="labelsmap",
+        lat=37.4419,
+        lng=-122.1419,
+        markers=[
+            {
+                'lat': 37.4500,
+                'lng': -122.1350,
+                'label': "X"
+            },
+            {
+                'lat':  37.4419,
+                'lng':  -122.1419,
+                'label': "Y"
+            },
+            {
+                'lat': 37.4300,
+                'lng': -122.1400,
+                'label': "Z"
+            }
+        ]
+    )
+
+```
+
+Which results in something like the following map:
+
+<img width="271" alt="Map showing markers with labels" src="https://user-images.githubusercontent.com/708882/92332217-a3363280-f041-11ea-975c-0ac9413ada68.png">
 
 ### Fit all markers within bounds
 
@@ -276,8 +301,7 @@ def map_bounded():
 
 ![image](https://user-images.githubusercontent.com/14223309/29294483-6ac3e532-8104-11e7-988c-5c19d700fe5b.png)
 
-
-### Geocoding and Reverse Geocoding 
+### Geocoding and Reverse Geocoding
 
 ```python
 from flask_googlemaps import get_address, get_coordinates
@@ -293,7 +317,6 @@ print(get_coordinates(API_KEY,'Netaji Subhash Engineering College Kolkata'))
 #output: {'lat': 22.4761596, 'lng': 88.4149326}
 ```
 
-
 ### Run the example app
 
 ```bash

docs/docs/contribute.md

@@ -0,0 +1,11 @@
+# Contribute
+
+To contribute with the project, clone it, create a virtualenv and install all of you need to dev, see below:
+
+```bash
+git clone https://github.com/flask-extensions/Flask-GoogleMaps.git
+cd Flask-GoogleMaps
+poetry use env 3.8  # just to create virtualenv at the first time
+poetry shell # activate virtualenv
+poetry install  # to install all for dev
+```