Skip to content

Commit c434c3e

Browse files
Revert "added GeoTIFFTileLayer (#28)"
This reverts commit ed26819.
1 parent ed26819 commit c434c3e

File tree

10 files changed

+623
-166
lines changed

10 files changed

+623
-166
lines changed

examples/introduction.ipynb

Lines changed: 604 additions & 19 deletions
Large diffs are not rendered by default.

ipyopenlayers/Map.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ class Layer(Widget):
2424
_view_module = Unicode(module_name).tag(sync=True)
2525
_view_module_version = Unicode(module_version).tag(sync=True)
2626

27-
class RasterTileLayer(Layer):
27+
class TileLayer(Layer):
2828

29-
_model_name = Unicode('RasterTileLayerModel').tag(sync=True)
30-
_view_name = Unicode('RasterTileLayerView').tag(sync=True)
29+
_model_name = Unicode('TileLayerModel').tag(sync=True)
30+
_view_name = Unicode('TileLayerView').tag(sync=True)
3131

3232
url = Unicode('https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png').tag(sync=True)
3333

@@ -39,10 +39,6 @@ class GeoJSON(Layer):
3939
style = Dict({}).tag(sync=True)
4040
visible = Bool(True).tag(sync=True)
4141

42-
class GeoTIFFTileLayer(Layer):
43-
_model_name = Unicode('GeoTIFFTileLayerModel').tag(sync=True)
44-
_view_name = Unicode('GeoTIFFTileLayerView').tag(sync=True)
45-
sources = List(Dict).tag(sync=True)
4642

4743
class HeatmapLayer(Layer):
4844
_view_name = Unicode('HeatmapLayerView').tag(sync=True)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"ts-jest": "^29.1.2",
8181
"ts-loader": "^9.5.1",
8282
"typescript": "~5.3.3",
83-
"webpack": "^5.93.0",
83+
"webpack": "^5.90.0",
8484
"webpack-cli": "^5.1.4"
8585
},
8686
"devDependenciesComments": {

src/geotifflayer.ts

Lines changed: 0 additions & 69 deletions
This file was deleted.

src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
// Distributed under the terms of the Modified BSD License.
33
export * from './version';
44
export * from './widget';
5+
export * from './tilelayer';
6+
export * from './basecontrol';
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import { MODULE_NAME, MODULE_VERSION } from './version';
88
import { MapView } from './widget';
99
import { LayerModel, LayerView } from './layer';
1010

11-
export class RasterTileLayerModel extends LayerModel {
11+
export class TileLayerModel extends LayerModel {
1212
defaults() {
1313
return {
1414
...super.defaults(),
15-
_model_name: RasterTileLayerModel.model_name,
16-
_model_module: RasterTileLayerModel.model_module,
17-
_model_module_version: RasterTileLayerModel.model_module_version,
18-
_view_name: RasterTileLayerModel.view_name,
19-
_view_module: RasterTileLayerModel.view_module,
20-
_view_module_version: RasterTileLayerModel.view_module_version,
15+
_model_name: TileLayerModel.model_name,
16+
_model_module: TileLayerModel.model_module,
17+
_model_module_version: TileLayerModel.model_module_version,
18+
_view_name: TileLayerModel.view_name,
19+
_view_module: TileLayerModel.view_module,
20+
_view_module_version: TileLayerModel.view_module_version,
2121
};
2222
}
2323

@@ -26,15 +26,15 @@ export class RasterTileLayerModel extends LayerModel {
2626
// Add any extra serializers here
2727
};
2828

29-
static model_name = 'RasterTileLayerModel';
29+
static model_name = 'TileLayerModel';
3030
static model_module = MODULE_NAME;
3131
static model_module_version = MODULE_VERSION;
32-
static view_name = 'RasterTileLayerView';
32+
static view_name = 'TileLayerView';
3333
static view_module = MODULE_NAME;
3434
static view_module_version = MODULE_VERSION;
3535
}
3636

37-
export class RasterTileLayerView extends LayerView {
37+
export class TileLayerView extends LayerView {
3838
map_view: MapView;
3939

4040
render() {

src/widget.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ export * from './zoomslider';
2828
export * from './fullscreen';
2929
export * from './scaleline';
3030
export * from './mouseposition';
31-
export * from './rastertilelayer';
31+
export * from './tilelayer';
3232
export * from './heatmap';
33-
export * from './geotifflayer';
3433

3534
const DEFAULT_LOCATION = [0.0, 0.0];
3635

-23 KB
Loading
8.17 KB
Loading

yarn.lock

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2779,15 +2779,6 @@ __metadata:
27792779
languageName: node
27802780
linkType: hard
27812781

2782-
"acorn-import-attributes@npm:^1.9.5":
2783-
version: 1.9.5
2784-
resolution: "acorn-import-attributes@npm:1.9.5"
2785-
peerDependencies:
2786-
acorn: ^8
2787-
checksum: 1c0c49b6a244503964ae46ae850baccf306e84caf99bc2010ed6103c69a423987b07b520a6c619f075d215388bd4923eccac995886a54309eda049ab78a4be95
2788-
languageName: node
2789-
linkType: hard
2790-
27912782
"acorn-jsx@npm:^5.3.2":
27922783
version: 5.3.2
27932784
resolution: "acorn-jsx@npm:5.3.2"
@@ -3866,16 +3857,6 @@ __metadata:
38663857
languageName: node
38673858
linkType: hard
38683859

3869-
"enhanced-resolve@npm:^5.17.0":
3870-
version: 5.17.0
3871-
resolution: "enhanced-resolve@npm:5.17.0"
3872-
dependencies:
3873-
graceful-fs: ^4.2.4
3874-
tapable: ^2.2.0
3875-
checksum: 1066000454da6a7aeabdbe1f433d912d1e39e6892142a78a37b6577aab27e0436091fa1399d857ad87085b1c3b73a0f811c8874da3dbdc40fbd5ebe89a5568e6
3876-
languageName: node
3877-
linkType: hard
3878-
38793860
"entities@npm:^4.2.0, entities@npm:^4.4.0":
38803861
version: 4.5.0
38813862
resolution: "entities@npm:4.5.0"
@@ -5000,7 +4981,7 @@ __metadata:
50004981
ts-jest: ^29.1.2
50014982
ts-loader: ^9.5.1
50024983
typescript: ~5.3.3
5003-
webpack: ^5.93.0
4984+
webpack: ^5.90.0
50044985
webpack-cli: ^5.1.4
50054986
languageName: unknown
50064987
linkType: soft
@@ -8401,7 +8382,7 @@ __metadata:
84018382
languageName: node
84028383
linkType: hard
84038384

8404-
"webpack@npm:^5.76.1":
8385+
"webpack@npm:^5.76.1, webpack@npm:^5.90.0":
84058386
version: 5.91.0
84068387
resolution: "webpack@npm:5.91.0"
84078388
dependencies:
@@ -8438,43 +8419,6 @@ __metadata:
84388419
languageName: node
84398420
linkType: hard
84408421

8441-
"webpack@npm:^5.93.0":
8442-
version: 5.93.0
8443-
resolution: "webpack@npm:5.93.0"
8444-
dependencies:
8445-
"@types/eslint-scope": ^3.7.3
8446-
"@types/estree": ^1.0.5
8447-
"@webassemblyjs/ast": ^1.12.1
8448-
"@webassemblyjs/wasm-edit": ^1.12.1
8449-
"@webassemblyjs/wasm-parser": ^1.12.1
8450-
acorn: ^8.7.1
8451-
acorn-import-attributes: ^1.9.5
8452-
browserslist: ^4.21.10
8453-
chrome-trace-event: ^1.0.2
8454-
enhanced-resolve: ^5.17.0
8455-
es-module-lexer: ^1.2.1
8456-
eslint-scope: 5.1.1
8457-
events: ^3.2.0
8458-
glob-to-regexp: ^0.4.1
8459-
graceful-fs: ^4.2.11
8460-
json-parse-even-better-errors: ^2.3.1
8461-
loader-runner: ^4.2.0
8462-
mime-types: ^2.1.27
8463-
neo-async: ^2.6.2
8464-
schema-utils: ^3.2.0
8465-
tapable: ^2.1.1
8466-
terser-webpack-plugin: ^5.3.10
8467-
watchpack: ^2.4.1
8468-
webpack-sources: ^3.2.3
8469-
peerDependenciesMeta:
8470-
webpack-cli:
8471-
optional: true
8472-
bin:
8473-
webpack: bin/webpack.js
8474-
checksum: c93bd73d9e1ab49b07e139582187f1c3760ee2cf0163b6288fab2ae210e39e59240a26284e7e5d29bec851255ef4b43c51642c882fa5a94e16ce7cb906deeb47
8475-
languageName: node
8476-
linkType: hard
8477-
84788422
"whatwg-mimetype@npm:^2.3.0":
84798423
version: 2.3.0
84808424
resolution: "whatwg-mimetype@npm:2.3.0"

0 commit comments

Comments
 (0)