Merge pull request #56 from eodaGmbH/feature/no-nav-control-by-default

Feature/no nav control by default
eoda-dev · Jun 17, 2024 · 78c7a58 · 78c7a58
2 parents df51315 + 8129644
commit 78c7a58
Show file tree

Hide file tree

Showing 23 changed files with 109 additions and 215 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for MapLibre for Python
 
+## maplibre v0.2.1
+
+* Do not add navigation control by default (#31)
+
 ## maplibre v0.2.0
 
 * Support Deck.GL layers (#28)

diff --git a/docs/examples/airports/app.py b/docs/examples/airports/app.py
@@ -10,7 +10,13 @@
     render_maplibregl,
 )
 from maplibre.basemaps import Carto
-from maplibre.controls import Marker, MarkerOptions, Popup, PopupOptions
+from maplibre.controls import (
+    Marker,
+    MarkerOptions,
+    NavigationControl,
+    Popup,
+    PopupOptions,
+)
 from maplibre.sources import GeoJSONSource
 from maplibre.utils import GeometryType, df_to_geojson
 from shiny import App, ui
@@ -69,6 +75,7 @@ def get_color(airport_type: str) -> str:
 
 def create_map() -> Map:
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_layer(airport_circles)
     for _, r in airports_data.iterrows():
         marker = Marker(

diff --git a/docs/examples/custom_basemap/app.html b/docs/examples/custom_basemap/app.html
diff --git a/docs/examples/custom_basemap/app.py b/docs/examples/custom_basemap/app.py
@@ -1,11 +1,11 @@
-import sys
 import webbrowser
 
 from maplibre import Layer, LayerType, Map, MapOptions
 from maplibre.basemaps import construct_basemap_style
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 
-file_name = "/tmp/pymaplibregl_temp.html"
+file_name = "docs/examples/custom_basemap/app.html"
 
 bg_layer = Layer(
     type=LayerType.BACKGROUND,
@@ -45,6 +45,7 @@
 
 def create_map():
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_layer(
         Layer(
             type=LayerType.CIRCLE,
@@ -61,9 +62,6 @@ def create_map():
 
 if __name__ == "__main__":
     m = create_map()
-    if len(sys.argv) == 2:
-        file_name = sys.argv[1]
-
     with open(file_name, "w") as f:
         f.write(m.to_html())
 

diff --git a/docs/examples/deckgl_layer/app.html b/docs/examples/deckgl_layer/app.html
diff --git a/docs/examples/deckgl_layer/app.py b/docs/examples/deckgl_layer/app.py
@@ -4,6 +4,7 @@
 
 from maplibre import Map, MapOptions, render_maplibregl
 from maplibre.basemaps import Carto
+from maplibre.controls import NavigationControl
 from maplibre.ui import use_deckgl
 
 # from shiny import reactive
@@ -18,7 +19,7 @@
         pitch=40,
     )
 )
-
+m.add_control(NavigationControl())
 
 deck_grid_layer = {
     "@@type": "GridLayer",

diff --git a/docs/examples/deckgl_layer/column_layer.py b/docs/examples/deckgl_layer/column_layer.py
@@ -5,7 +5,6 @@
 from maplibre import Map, MapOptions, render_maplibregl
 from maplibre.basemaps import Carto
 from maplibre.ui import use_deckgl
-
 # from shiny import reactive
 from shiny.express import input, render, ui
 

diff --git a/docs/examples/deckgl_multiple_layers/app.py b/docs/examples/deckgl_multiple_layers/app.py
@@ -3,6 +3,7 @@
 import requests as req
 from maplibre import Map, MapOptions, render_maplibregl
 from maplibre.basemaps import Carto
+from maplibre.controls import NavigationControl
 from maplibre.ui import use_deckgl
 from shiny.express import input, render, ui
 
@@ -19,6 +20,7 @@
         pitch=30,
     )
 )
+m.add_control(NavigationControl())
 
 deck_geojson_layer = {
     "@@type": "GeoJsonLayer",

diff --git a/docs/examples/earthquake_clusters/app.py b/docs/examples/earthquake_clusters/app.py
@@ -9,6 +9,7 @@
     render_maplibregl,
 )
 from maplibre.basemaps import Carto
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 from shiny import App, reactive, ui
 
@@ -74,6 +75,7 @@
 
 def create_map() -> Map:
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_source(EARTHQUAKE_SOURCE, earthquakes_source)
     m.add_layer(earthquake_clusters)
     m.add_layer(earthquake_circles)

diff --git a/docs/examples/every_person_in_manhattan/app.py b/docs/examples/every_person_in_manhattan/app.py
@@ -13,7 +13,7 @@
     render_maplibregl,
 )
 from maplibre.basemaps import Carto
-from maplibre.controls import ScaleControl
+from maplibre.controls import NavigationControl, ScaleControl
 from maplibre.sources import GeoJSONSource
 from maplibre.utils import df_to_geojson
 from shiny import App, reactive, ui
@@ -57,6 +57,7 @@
 
 def create_map() -> Map:
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_control(ScaleControl(), position="bottom-left")
     m.add_layer(every_person_in_manhattan_circles)
     return m

diff --git a/docs/examples/geopandas/app.py b/docs/examples/geopandas/app.py
@@ -2,6 +2,7 @@
 import webbrowser
 
 from maplibre import Layer, LayerType, Map, MapOptions
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 from maplibre.utils import geopandas_to_geojson
 
@@ -28,6 +29,7 @@
 
 def create_map():
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_layer(wilderness_layer)
     m.add_tooltip(LAYER_ID, "NAME")
     return m

diff --git a/docs/examples/layer_order/app.py b/docs/examples/layer_order/app.py
@@ -3,6 +3,7 @@
 import requests as req
 from maplibre import Layer, LayerType, Map, MapOptions, render_maplibregl
 from maplibre.basemaps import Carto, construct_carto_basemap_url
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 from shiny.express import input, render, ui
 
@@ -25,6 +26,7 @@
         hash=True,
     )
 )
+m.add_control(NavigationControl())
 m.add_layer(
     Layer(
         id="urban-areas-fill",

diff --git a/docs/examples/road_safety/app.py b/docs/examples/road_safety/app.py
@@ -12,6 +12,7 @@
     output_maplibregl,
     render_maplibregl,
 )
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 from maplibre.utils import df_to_geojson
 from shiny import App, reactive, ui
@@ -72,6 +73,7 @@ def create_h3_grid(res=RESOLUTION) -> dict:
 
 def create_map() -> Map:
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_layer(h3_layer)
     m.add_tooltip("road-safety", "count")
     return m

diff --git a/docs/examples/vancouver_blocks/app.py b/docs/examples/vancouver_blocks/app.py
@@ -10,7 +10,7 @@
     render_maplibregl,
 )
 from maplibre.basemaps import Carto
-from maplibre.controls import ScaleControl
+from maplibre.controls import NavigationControl, ScaleControl
 from maplibre.sources import GeoJSONSource
 from shiny import App, reactive, ui
 
@@ -64,6 +64,7 @@
 
 def create_map() -> Map:
     m = Map(map_options)
+    m.add_control(NavigationControl())
     m.add_control(ScaleControl(), position="bottom-left")
     m.add_source(SOURCE_ID, vancouver_blocks_source)
     m.add_layer(vancouver_blocks_lines)

diff --git a/docs/examples/where_is_the_iss/app.py b/docs/examples/where_is_the_iss/app.py
@@ -8,6 +8,7 @@
     output_maplibregl,
     render_maplibregl,
 )
+from maplibre.controls import NavigationControl
 from maplibre.sources import GeoJSONSource
 from shiny import App, reactive, ui
 
@@ -51,6 +52,7 @@ def server(input, output, session):
     @render_maplibregl
     def mapylibre():
         m = Map(MapOptions(center=lng_lat, zoom=3))
+        m.add_control(NavigationControl())
         m.set_paint_property("water", "fill-color", "darkblue")
         m.add_source(
             SOURCE_ID_ISS_LAST_POSITIONS, GeoJSONSource(data=feature_collection)