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.

Sign up for GitHub

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

Overlay #5

Closed
wants to merge 2 commits into from
Closed

Overlay #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79b03d
add full-screen+location+slider-zoom+scale-line
Nour-Cheour10 May 17, 2024
bafdc6b
added overlay functionality
Nour-Cheour10 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 58 additions & 70 deletions examples/introduction.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"metadata": {},
"outputs": [],
"source": [
"from ipyopenlayers import Map, TileLayer"
"from ipyopenlayers import Map, TileLayer, ImageOverLayer"
]
},
{
Expand All @@ -24,7 +24,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "757d5de3cec24c4e83d186b710dcfa59",
"model_id": "fd180ddb3ce34b25b1398585399bfb59",
"version_major": 2,
"version_minor": 0
},
Expand All @@ -38,32 +38,13 @@
}
],
"source": [
"m = Map()\n",
"m = Map(center=[0.0, 0.0], zoom=2)\n",
"m"
]
},
{
"cell_type": "code",
"execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
"m.zoom=4\n",
"\n"
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
"m.center=[10.0,5.0]"
]
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -73,7 +54,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 9,
"metadata": {
"scrolled": true
},
Expand All @@ -84,7 +65,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand All @@ -93,7 +74,7 @@
"[TileLayer(url='https://{a-c}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png')]"
]
},
"execution_count": 8,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -104,7 +85,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -113,7 +94,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 8,
"metadata": {},
"outputs": [
{
Expand All @@ -122,7 +103,7 @@
"[]"
]
},
"execution_count": 10,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -133,97 +114,104 @@
},
{
"cell_type": "code",
"execution_count": 11,
"metadata": {},
"outputs": [],
"source": [
"m.clear_layers()"
]
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": 17,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "8df509e3cc2b46e1b35e5b67f8194472",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"[]"
"ImageOverLayer(image_bounds=[0, 0])"
]
},
"execution_count": 28,
"execution_count": 17,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"m.layers"
"image=ImageOverLayer()\n",
"image"
]
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 18,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "59aea50b07f14f028e2fb5e01c43a461",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"Map(center=[0.0, 0.0])"
]
},
"execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"m1 = Map(center=[0.0, 0.0], zoom=2)\n",
"m1"
"image.image_url=\"https://i.imgur.com/06Q1fSz.png\""
]
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 19,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"2.0"
"'https://i.imgur.com/06Q1fSz.png'"
]
},
"execution_count": 13,
"execution_count": 19,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"m1.zoom\n"
"image.image_url\n"
]
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 20,
"metadata": {},
"outputs": [],
"source": [
"m.add_Overlayer(image)"
]
},
{
"cell_type": "code",
"execution_count": 21,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[0.0, 0.0]"
"[ImageOverLayer(image_bounds=[0, 0], image_url='https://i.imgur.com/06Q1fSz.png')]"
]
},
"execution_count": 14,
"execution_count": 21,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"m1.center"
"m.OverLayers"
]
},
{
"cell_type": "code",
"execution_count": 23,
"metadata": {},
"outputs": [],
"source": [
"image.image_bounds=([-100,30]) "
]
},
{
"cell_type": "code",
"execution_count": 24,
"metadata": {},
"outputs": [],
"source": [
"m.remove_Overlayer(image)"
]
},
{
Expand Down
33 changes: 30 additions & 3 deletions ipyopenlayers/example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
TODO: Add module docstring
"""

from ipywidgets import DOMWidget, Widget, widget_serialization
from traitlets import Unicode, List, Instance, CFloat
from ipywidgets import DOMWidget, Widget, widget_serialization, HTML
from traitlets import Unicode, List, Instance, CFloat, Bool,Int, Float
from ._frontend import module_name, module_version

def_loc = [0.0, 0.0]

class TileLayer(Widget):
Expand All @@ -22,7 +23,19 @@ class TileLayer(Widget):
_view_module = Unicode(module_name).tag(sync=True)
_view_module_version = Unicode(module_version).tag(sync=True)
url = Unicode('https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png').tag(sync=True)


class ImageOverLayer (DOMWidget):

_model_name = Unicode('ImageOverLayerModel').tag(sync=True)
_model_module = Unicode(module_name).tag(sync=True)
_model_module_version = Unicode(module_version).tag(sync=True)
_view_name = Unicode('ImageOverLayerView').tag(sync=True)
_view_module = Unicode(module_name).tag(sync=True)
_view_module_version = Unicode(module_version).tag(sync=True)

image_url = Unicode('').tag(sync=True)
image_bounds = List([0, 0]).tag(sync=True)


class Map(DOMWidget):
_model_name = Unicode('MapModel').tag(sync=True)
Expand All @@ -36,7 +49,14 @@ class Map(DOMWidget):
center = List(def_loc).tag(sync=True, o=True)
zoom = CFloat(2).tag(sync=True, o=True)
layers = List(Instance(TileLayer)).tag(sync=True, **widget_serialization)
OverLayers=List(Instance(ImageOverLayer)).tag(sync=True, **widget_serialization)

title = Unicode('').tag(sync=True)
zoom_slider = Bool(False).tag(sync=True)
scale_line = Bool(False).tag(sync=True)
full_screen = Bool(False).tag(sync=True)
mouse_position= Bool(False).tag(sync=True)

def __init__(self, center=None, zoom=None, **kwargs):
super().__init__(**kwargs)

Expand All @@ -49,10 +69,17 @@ def __init__(self, center=None, zoom=None, **kwargs):
def add_layer(self, layer):
self.layers = self.layers + [layer]

def add_Overlayer(self, Overlayer):
self.OverLayers = self.OverLayers + [Overlayer]

def remove_layer(self, layer):
self.layers = [x for x in self.layers if x != layer]

def remove_Overlayer(self, Overlayer):
self.OverLayers = [x for x in self.OverLayers if x != Overlayer]

def clear_layers(self):
self.layers = []



Loading
Loading