changed raster to webgl

Author: Nour-Cheour10

examples/introduction.ipynb

@@ -24,8 +24,8 @@
    "source": [
     "import configparser\n",
     "config = configparser.ConfigParser()\n",
-    "config.read('.config')\n",
-    "key = config['DEFAULT']['token']"
+    "config.read('.config.ini')\n",
+    "key = config['DEFAULT']['key']"
    ]
   },
   {
@@ -38,7 +38,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "",
+       "model_id": "e041191333a64c19bbd2db471ae28a2e",
        "version_major": 2,
        "version_minor": 0
       },

ipyopenlayers/Map.py

@@ -23,17 +23,7 @@ class Layer(Widget):
     _view_module = Unicode(module_name).tag(sync=True)
     _view_module_version = Unicode(module_version).tag(sync=True)
 
-<<<<<<< HEAD
-class RasterTileLayer(Layer):
-<<<<<<< HEAD
-
-    _model_name = Unicode('RasterTileLayerModel').tag(sync=True)
-    _view_name = Unicode('RasterTileLayerView').tag(sync=True)
-=======
->>>>>>> 4c0c99b (added vectortilelayer +change tilelayer to ratsertilelayer)
-=======
 class TileLayer(Layer):
->>>>>>> ff8cce2 (added types to VectorTileLayer)
 
     url = Unicode('https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png').tag(sync=True)
     attribution = Unicode("").tag(sync=True)
@@ -42,6 +32,11 @@ class TileLayer(Layer):
     min_zoom = Int(0).tag(sync=True)
     max_zoom = Int(18).tag(sync=True)
     source_format = Dict().tag(sync=True)
+    
+class GeoTIFFTileLayer(Layer):
+   _model_name = Unicode('GeoTIFFTileLayerModel').tag(sync=True)
+   _view_name = Unicode('GeoTIFFTileLayerView').tag(sync=True)
+   url = Unicode('').tag(sync=True)
 
 
 class RasterTileLayer(TileLayer):
@@ -64,10 +59,6 @@ class GeoJSON(Layer):
     style = Dict({}).tag(sync=True)
     visible = Bool(True).tag(sync=True)
 
-class GeoTIFFTileLayer(Layer):
-   _model_name = Unicode('GeoTIFFTileLayerModel').tag(sync=True)
-   _view_name = Unicode('GeoTIFFTileLayerView').tag(sync=True)
-   url = Unicode('').tag(sync=True)
 
 class HeatmapLayer(Layer):
     _view_name = Unicode('HeatmapLayerView').tag(sync=True)
@@ -77,6 +68,8 @@ class HeatmapLayer(Layer):
     radius = Int(8).tag(sync=True)
 
 
+
+
 class BaseOverlay(DOMWidget): 
 
    _model_module = Unicode(module_name).tag(sync=True)

src/index.ts

@@ -2,8 +2,3 @@
 // Distributed under the terms of the Modified BSD License.
 export * from './version';
 export * from './widget';
-<<<<<<< HEAD
-=======
-export * from './rastertilelayer';
-export * from './basecontrol';
->>>>>>> 4c0c99b (added vectortilelayer +change tilelayer to ratsertilelayer)

src/rastertilelayer.ts

@@ -1,9 +1,8 @@
 // Copyright (c) QuantStack
 // Distributed under the terms of the Modified BSD License.
 import { DOMWidgetModel, ISerializers } from '@jupyter-widgets/base';
-import TileLayer from 'ol/layer/Tile';
-import XYZ from 'ol/source/XYZ';
-import OSM from 'ol/source/OSM';
+import TileLayer from 'ol/layer/WebGLTile.js';
+import XYZ from 'ol/source/XYZ.js';  // Ensure the correct path
 import { MODULE_NAME, MODULE_VERSION } from './version';
 import { MapView } from './widget';
 import { LayerModel, LayerView } from './layer';
@@ -19,6 +18,11 @@ export class RasterTileLayerModel extends LayerModel {
       _view_module: RasterTileLayerModel.view_module,
       _view_module_version: RasterTileLayerModel.view_module_version,
       layers: [],
+      url: '', // Ensure you have a default value for 'url'
+      attributions: [],
+      tileSize: 256,
+      max_zoom: 19,
+      min_zoom: 0,
     };
   }
 
@@ -30,16 +34,17 @@ export class RasterTileLayerModel extends LayerModel {
   static model_name = 'RasterTileLayerModel';
   static model_module = MODULE_NAME;
   static model_module_version = MODULE_VERSION;
-  static view_name = 'RasterTileLayerVIew';
+  static view_name = 'RasterTileLayerView'; // Corrected typo
   static view_module = MODULE_NAME;
   static view_module_version = MODULE_VERSION;
 }
 
 export class RasterTileLayerView extends LayerView {
   map_view: MapView;
+
   render() {
     super.render();
-    this.urlChanged();
+    this.urlChanged(); // Call this method after creating the object
     this.model.on('change:url', this.urlChanged, this);
   }
 
@@ -69,5 +74,5 @@ export class RasterTileLayerView extends LayerView {
     }
   }
 
-  tileLayer: TileLayer<OSM>;
+  tileLayer: TileLayer;
 }

src/widget.ts

@@ -28,6 +28,11 @@ export * from './fullscreen';
 export * from './scaleline';
 export * from './mouseposition';
 export * from './heatmap';
+export * from './rastertilelayer'
+export * from './geotifflayer'
+export * from './vectortilelayer'
+
+
 
 const DEFAULT_LOCATION = [0.0, 0.0];