Skip to content

Overlay #6

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

Closed
wants to merge 9 commits into from
Closed

Overlay #6

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 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
2ef9fe6
add multiple overlays
Nour-Cheour10 May 28, 2024
62f22f0
Update ipyopenlayers/example.py
Nour-Cheour10 May 29, 2024
30bf838
Update ipyopenlayers/example.py
Nour-Cheour10 May 29, 2024
dc7488d
correcting naming conventions
Nour-Cheour10 May 29, 2024
bbf47b2
naming conventions
Nour-Cheour10 May 30, 2024
04c3b84
Changes in the nootebook
Nour-Cheour10 May 30, 2024
dfed9ae
Variable Correction
Nour-Cheour10 May 30, 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
163 changes: 41 additions & 122 deletions examples/introduction.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,229 +9,148 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 26,
"metadata": {},
"outputs": [],
"source": [
"from ipyopenlayers import Map, TileLayer"
"from ipyopenlayers import Map, TileLayer, ImageOverLayer"
]
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 27,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "757d5de3cec24c4e83d186b710dcfa59",
"model_id": "b5ca1d6e4568477b9b74c923a0be1262",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"Map(center=[0.0, 0.0])"
]
},
"execution_count": 2,
"execution_count": 27,
"metadata": {},
"output_type": "execute_result"
}
],
"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,
"metadata": {},
"outputs": [],
"source": [
"layere= TileLayer()\n",
"layere.url=\"https://{a-c}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png\"\n"
]
},
{
"cell_type": "code",
"execution_count": 7,
"metadata": {
"scrolled": true
},
"outputs": [],
"source": [
"m.add_layer(layere)"
]
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 28,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "2bf7058855764a519a4ff61ea74324a7",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"[TileLayer(url='https://{a-c}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png')]"
"ImageOverLayer(image_bounds=[0, 0])"
]
},
"execution_count": 8,
"execution_count": 28,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"m.layers"
"image=ImageOverLayer()\n",
"image"
]
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 29,
"metadata": {},
"outputs": [],
"source": [
"m.remove_layer(layere)"
"image.image_url=\"https://i.imgur.com/06Q1fSz.png\""
]
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 30,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[]"
]
},
"execution_count": 10,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"m.layers"
"image.image_url=\"\""
]
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 31,
"metadata": {},
"outputs": [],
"source": [
"m.clear_layers()"
"m.add_Overlayer(image)"
]
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": 32,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[]"
]
},
"execution_count": 28,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"m.layers"
"image.image_bounds=[-70,70]"
]
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 33,
"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])"
"[ImageOverLayer(image_bounds=[-70, 70])]"
]
},
"execution_count": 12,
"execution_count": 33,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"m1 = Map(center=[0.0, 0.0], zoom=2)\n",
"m1"
"m.over_layers"
]
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 34,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"2.0"
]
},
"execution_count": 13,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"m1.zoom\n"
"imaget=ImageOverLayer()\n",
"imaget.image_url=\"https://upload.wikimedia.org/wikipedia/en/a/a9/Example.jpg\"\n"
]
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 35,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[0.0, 0.0]"
]
},
"execution_count": 14,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"m1.center"
"m.add_Overlayer(imaget)"
]
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 36,
"metadata": {},
"outputs": [],
"source": []
"source": [
"m.remove_Overlayer(image)"
]
}
],
"metadata": {
Expand Down
36 changes: 30 additions & 6 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)
over_layers=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,14 @@ def __init__(self, center=None, zoom=None, **kwargs):
def add_layer(self, layer):
self.layers = self.layers + [layer]

def add_Overlayer(self, over_layer):
self.over_layers = self.over_layers + [over_layer]

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

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

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


self.layers = []
6 changes: 3 additions & 3 deletions src/__tests__/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class DummyManager extends baseManager.ManagerBase {
display_view(
msg: services.KernelMessage.IMessage,
view: widgets.DOMWidgetView,
options: any
options: any,
) {
// TODO: make this a spy
// TODO: return an html element
Expand All @@ -68,7 +68,7 @@ export class DummyManager extends baseManager.ManagerBase {
protected loadClass(
className: string,
moduleName: string,
moduleVersion: string
moduleVersion: string,
): Promise<any> {
if (moduleName === '@jupyter-widgets/base') {
if ((widgets as any)[className]) {
Expand Down Expand Up @@ -106,7 +106,7 @@ export interface Constructor<T> {

export function createTestModel<T extends widgets.WidgetModel>(
constructor: Constructor<T>,
attributes?: any
attributes?: any,
): T {
const id = widgets.uuid();
const widget_manager = new DummyManager();
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default examplePlugin;
*/
function activateWidgetExtension(
app: Application<Widget>,
registry: IJupyterWidgetRegistry
registry: IJupyterWidgetRegistry,
): void {
registry.registerWidget({
name: MODULE_NAME,
Expand Down
Loading
Loading