Removed support for Python 3.6 opengeos#91

kuzja111 · Aug 5, 2021 · bd2afe7 · bd2afe7
1 parent b1f697c
commit bd2afe7
Show file tree

Hide file tree

Showing 21 changed files with 137 additions and 135 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,6 @@ jobs:
  config:
  # - { os: windows-latest, py: "3.7" }
  - { os: macOS-latest, py: "3.8" }
- - { os: ubuntu-latest, py: "3.6" }
  - { os: ubuntu-latest, py: "3.7" }
  - { os: ubuntu-latest, py: "3.8" }
  - { os: ubuntu-latest, py: "3.9" }

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.4.1 - August 4, 2021
+
+**New Features**:
+
+- Added 200+ basemaps from xyzservices [#91](https://github.com/giswqs/leafmap/issues/91)
+
+**Improvement**
+
+- Fixed typo [#90](https://github.com/giswqs/leafmap/pull/90)
+- Added kepler module to mkdocs
+- Removed support for Python 3.6 due to xyzservices
+
 ## v0.4.0 - July 28, 2021
 
 **New Features**:

diff --git a/docs/html/kepler.html b/docs/html/kepler.html
diff --git a/docs/html/kepler_cities.html b/docs/html/kepler_cities.html
diff --git a/docs/html/kepler_countries.html b/docs/html/kepler_countries.html
diff --git a/docs/html/kepler_hex.html b/docs/html/kepler_hex.html
diff --git a/docs/html/kepler_lines.html b/docs/html/kepler_lines.html
diff --git a/docs/html/kepler_states.html b/docs/html/kepler_states.html
diff --git a/docs/notebooks/00_key_features.ipynb b/docs/notebooks/00_key_features.ipynb
@@ -488,7 +488,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_geocode(\"New York City\", layer_name='NYC')\n",
  "m"
  ]
@@ -506,7 +506,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "place = \"Bunker Hill, Los Angeles, California\"\n",
  "tags = {\"building\": True}\n",
  "m.add_osm_from_place(place, tags, layer_name=\"Los Angeles, CA\")\n",

diff --git a/docs/notebooks/11_linked_maps.ipynb b/docs/notebooks/11_linked_maps.ipynb
@@ -2,123 +2,123 @@
  "cells": [
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "[![image](https://binder.pangeo.io/badge_logo.svg)](https://gishub.org/leafmap-pangeo)\n",
  "\n",
  "**Creating linked maps for visualizing multiple maps simultaneously**\n",
  "\n",
  "Uncomment the following line to install [leafmap](https://leafmap.org) if needed."
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {},
- "outputs": [],
  "source": [
  "# !pip install leafmap"
- ]
+ ],
+ "outputs": [],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "This notebook example requires the ipyleaflet plotting backend. Folium is not supported."
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {},
- "outputs": [],
  "source": [
  "import leafmap.leafmap as leafmap"
- ]
+ ],
+ "outputs": [],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "Print out the list of available basemaps."
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {},
- "outputs": [],
  "source": [
- "print(leafmap.basemap_tiles.keys())"
- ]
+ "print(leafmap.leafmap_basemaps.keys())"
+ ],
+ "outputs": [],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "Specify the number of rows and columns to create a linked map. The `layers` parameter accepts a list of two XYZ tile layers, which can be chosen from the basemap names, or any custom XYZ tile layer."
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {},
- "outputs": [],
  "source": [
  "layers = ['ROADMAP', 'HYBRID']\n",
  "leafmap.linked_maps(rows=1, cols=2, height='400px', layers=layers)"
- ]
+ ],
+ "outputs": [],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "![](https://i.imgur.com/9qwmgPR.jpg)"
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {
- "scrolled": false
- },
- "outputs": [],
  "source": [
  "layers = ['Stamen.Terrain', 'OpenTopoMap']\n",
  "leafmap.linked_maps(rows=1, cols=2, height='400px', layers=layers)"
- ]
+ ],
+ "outputs": [],
+ "metadata": {
+ "scrolled": false
+ }
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "![](https://i.imgur.com/tx89sKu.png)"
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "Create a 2 * 2 linked map to visualize land cover change. Specify the `center` and `zoom` parameters to change the default map center and zoom level."
- ]
+ ],
+ "metadata": {}
  },
  {
  "cell_type": "code",
  "execution_count": null,
- "metadata": {},
- "outputs": [],
  "source": [
  "layers = [str(f\"NLCD {year} CONUS Land Cover\") for year in [2001, 2006, 2011, 2016]]\n",
  "labels = [str(f\"NLCD {year}\") for year in [2001, 2006, 2011, 2016]]\n",
  "leafmap.linked_maps(rows=2, cols=2, height='300px', layers=layers, labels=labels, center=[36.1, -115.2], zoom=9)"
- ]
+ ],
+ "outputs": [],
+ "metadata": {}
  },
  {
  "cell_type": "markdown",
- "metadata": {},
  "source": [
  "![](https://i.imgur.com/VUp7H3m.png)"
- ]
+ ],
+ "metadata": {}
  }
  ],
  "metadata": {
@@ -185,4 +185,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/docs/notebooks/15_openstreetmap.ipynb b/docs/notebooks/15_openstreetmap.ipynb
@@ -43,7 +43,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_geocode(\"New York City\", layer_name='NYC')\n",
  "m"
  ]
@@ -54,7 +54,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_geocode(\"Chicago, Illinois\", layer_name='Chicago, IL')\n",
  "m"
  ]
@@ -72,7 +72,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "place = \"Bunker Hill, Los Angeles, California\"\n",
  "tags = {\"building\": True}\n",
  "m.add_osm_from_place(place, tags, layer_name=\"Los Angeles, CA\")\n",
@@ -110,7 +110,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_address(\n",
  " address=\"New York City\", \n",
  " tags={\"amenity\": \"bar\"}, \n",
@@ -125,7 +125,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_address(\n",
  " address=\"New York City\", \n",
  " tags={\n",
@@ -149,7 +149,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "north, south, east, west = 40.7551, 40.7454, -73.9738, -73.9965\n",
  "m.add_osm_from_bbox(north, south, east, west, tags={\"amenity\": \"bar\"}, layer_name=\"NYC bars\")\n",
  "m"
@@ -168,7 +168,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(center=[46.7808, -96.0156], zoom=12, google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(center=[46.7808, -96.0156], zoom=12, toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_point(center_point=(46.7808, -96.0156), tags={\"natural\": \"water\"}, dist=10000, layer_name=\"Lakes\")\n",
  "m"
  ]
@@ -179,7 +179,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(center=[39.9170, 116.3908], zoom=15, google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(center=[39.9170, 116.3908], zoom=15, toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_point(center_point=(39.9170, 116.3908), tags={\"building\": True, \"natural\": \"water\"}, dist=1000, layer_name=\"Beijing\")\n",
  "m"
  ]
@@ -197,7 +197,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.set_center(-73.9854, 40.7500, 16)\n",
  "m"
  ]

diff --git a/examples/notebooks/00_key_features.ipynb b/examples/notebooks/00_key_features.ipynb
@@ -488,7 +488,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "m.add_osm_from_geocode(\"New York City\", layer_name='NYC')\n",
  "m"
  ]
@@ -506,7 +506,7 @@
  "metadata": {},
  "outputs": [],
  "source": [
- "m = leafmap.Map(google_map=None, toolbar_control=False, layers_control=True)\n",
+ "m = leafmap.Map(toolbar_control=False, layers_control=True)\n",
  "place = \"Bunker Hill, Los Angeles, California\"\n",
  "tags = {\"building\": True}\n",
  "m.add_osm_from_place(place, tags, layer_name=\"Los Angeles, CA\")\n",