Merge pull request #140 from eoda-dev/feature/maplibre-geocoding-control

Feature/maplibre geocoding control

Author: crazycapivara

_experimental/maplibre_express_circle.py

@@ -1,8 +1,8 @@
 from maplibre import express as mx
 from maplibre.__future__ import datasets
-from maplibre.config import options
+from maplibre.config import config
 
-options.fallback_color = "steelblue"
+config.fallback_color = "steelblue"
 
 data = datasets.DataSets.earthquakes.url
 # data = "/home/stefan/tmp/vancouver-blocks.json"

_experimental/maplibre_express_fill.py

@@ -1,8 +1,8 @@
 from maplibre import express as mx
 from maplibre.__future__ import datasets
-from maplibre.config import options
+from maplibre.config import config
 
-options.fallback_color = "steelblue"
+config.fallback_color = "steelblue"
 
 data = datasets.DataSets.vancouver_blocks.url
 # data = "/home/stefan/tmp/vancouver-blocks.json"

docs/changelog.md

@@ -1,11 +1,23 @@
 # Changelog for MapLibre for Python
 
+## maplibre v0.3.4 (unreleased)
+
+* Rename `basemap.BasemapStyle` to `basemap.Basemap`
+* Move _Shiny_ bindings to `maplibre.shiny`
+* Add
+  - `maplibre.__future.__.controls.GeocodingControl`
+  - `maplibre.__future.__.ipywidget.MapWidget`.
+
+to test [maplibre-gl-geocoder](https://maplibre.org/maplibre-gl-js/docs/examples/geocoder/maplibre).
+
+_Note:_ `maplibre-geocoder-css` overwrites `maptiler-geocoder-css`
+
 ## maplibre v0.3.3
 
 * Switch to [MapLibre GL JS v5.3.1](https://github.com/maplibre/maplibre-gl-js/releases/tag/v5.3.1) 
 * Bundle `maplibregl-js` with bindings
 * Add [MapTiler Geocoding Control](https://docs.maptiler.com/sdk-js/modules/geocoding/api/usage/maplibre-gl-js/) (#138): `maplibre.controls.MapTilerGeocodingControl`
-** Add `Map.base_layers` property
+* Add `Map.base_layers` property
 
 ## maplibre v0.3.2
 

examples/basemaps/maptiler.py

@@ -1,27 +1,28 @@
 import os
 
 from maplibre import Map, MapOptions
-from maplibre.basemaps import BasemapStyle, MapTiler
+from maplibre.__future__.controls import GeocodingControl
+from maplibre.basemaps import Basemap, MapTiler
 
 # from maplibre.sky import Sky
 # from maplibre.light import Light
-from maplibre.config import options
+from maplibre.config import config
 from maplibre.controls import (
     ControlPosition,
     MapTilerGeocodingControl,
     GlobeControl,
     NavigationControl,
 )
 
-print(options.maptiler_api_key_env_var)
+print(config.maptiler_api_key_env_var)
 # os.environ[options.maptiler_api_key_env_var] = "your-api-key"
-print(options.maptiler_api_key)
+print(config.maptiler_api_key)
 
 # sky = Sky(atmosphere_blend=["interpolate", ["linear"], ["zoom"], 0, 1, 5, 1, 7, 0])
 # light = Light(anchor="map", position=[1.5, 90, 80], intensity=0.5)
 
 
-style = BasemapStyle.maptiler_url(MapTiler.SATELLITE)
+style = Basemap.maptiler_url(MapTiler.SATELLITE)
 # print(style)
 
 map_options = MapOptions(style=style)
@@ -31,8 +32,15 @@
     controls=[
         NavigationControl(),
         GlobeControl(),
-        MapTilerGeocodingControl(position=ControlPosition.TOP_LEFT),
+        MapTilerGeocodingControl(
+            collapsed=True,
+            show_place_type="always",
+            country="de",
+            position=ControlPosition.TOP_LEFT
+        ),
+        # GeocodingControl(collapsed=True, position=ControlPosition.TOP_LEFT)
     ],
 )
 # m.set_light(light)
+print(m._geocoder_type)
 m.save(preview=True)

examples/basemaps/raster-tiles.py

@@ -2,9 +2,9 @@
 
 from maplibre import Map, MapOptions, Layer, LayerType
 from maplibre.sources import RasterSource
-from maplibre.basemaps import BasemapStyle
+from maplibre.basemaps import Basemap
 
-style = BasemapStyle(
+style = Basemap(
     sources={
         "raster-tiles": RasterSource(
             tiles=["https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"],

examples/layers/sky-with-fog-and-terrain.py

@@ -4,13 +4,13 @@
 #
 from maplibre import Map, MapOptions, Layer, LayerType
 from maplibre.sources import RasterTileSource, RasterDEMSource
-from maplibre.basemaps import BasemapStyle
+from maplibre.basemaps import Basemap
 from maplibre.controls import NavigationControl, TerrainControl
 from maplibre.sky import Sky
 from maplibre.terrain import Terrain
 
 
-style = BasemapStyle(
+style = Basemap(
     sources=dict(
         osm=RasterTileSource(
             tiles=["https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"],

examples/maplibre_express_circle.py

@@ -1,5 +1,5 @@
 from maplibre import express as mx
-from maplibre.config import options
+from maplibre.config import config
 from maplibre.expressions import interpolate
 
 data = "https://docs.mapbox.com/mapbox-gl-js/assets/earthquakes.geojson"

examples/maplibre_express_fill.py

@@ -1,11 +1,11 @@
 from maplibre import express as mx
-from maplibre.config import options
+from maplibre.config import config
 from maplibre.expressions import interpolate
 
-options.fallback_color = "#ffffff"
-options.fill_outline_color = "yellow"
-options.fill_opacity = 1
-options.cmap = "YlOrRd"
+config.fallback_color = "#ffffff"
+config.fill_outline_color = "yellow"
+config.fill_opacity = 1
+config.cmap = "YlOrRd"
 
 # data = "https://docs.maptiler.com/sdk-js/assets/Mean_age_of_women_at_first_marriage_in_2019.geojson"
 # data = "https://d2ad6b4ur7yvpq.cloudfront.net/naturalearth-3.3.0/ne_50m_urban_areas.geojson"

examples/maplibre_express_fill_extrusion.py

@@ -1,11 +1,11 @@
 from maplibre import express as mx
-from maplibre.config import options
+from maplibre.config import config
 from maplibre.expressions import get_column, interpolate
 
-options.fallback_color = "#ffffff"
-options.fill_extrusion_color = "yellow"
-options.fill_extrusion_opacity = 0.5
-options.cmap = "YlOrRd"
+config.fallback_color = "#ffffff"
+config.fill_extrusion_color = "yellow"
+config.fill_extrusion_opacity = 0.5
+config.cmap = "YlOrRd"
 
 # data = "https://docs.maptiler.com/sdk-js/assets/Mean_age_of_women_at_first_marriage_in_2019.geojson"
 data = "https://d2ad6b4ur7yvpq.cloudfront.net/naturalearth-3.3.0/ne_50m_urban_areas.geojson"

examples/maplibre_express_line.py

@@ -1,9 +1,9 @@
 from maplibre import express as mx
-from maplibre.config import options
+from maplibre.config import config
 from maplibre.expressions import interpolate
 
-options.line_width = 2
-options.line_color = "green"
+config.line_width = 2
+config.line_color = "green"
 
 # data = "https://docs.maptiler.com/sdk-js/assets/Mean_age_of_women_at_first_marriage_in_2019.geojson"
 # data = "https://d2ad6b4ur7yvpq.cloudfront.net/naturalearth-3.3.0/ne_50m_urban_areas.geojson"