Skip to content

Commit

Permalink
fix examples bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
Siedlerchr committed Aug 9, 2022
1 parent 6271233 commit 488174a
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 42 deletions.
1 change: 0 additions & 1 deletion examples/animation/map.featureanimation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { LineString, Point, Polygon } from 'ol/geom';
import { Coordinate } from 'ol/coordinate';
import 'ol-ext/render/AnimExtent';
import featureAnimation from 'ol-ext/featureanimation/FeatureAnimation';
import { getKey } from 'ol/tilecoord';
// Layers
let layer = new TileLayer({
source: new Stamen({ layer: 'terrain' }),
Expand Down
3 changes: 1 addition & 2 deletions examples/bar/map.control.bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Map, View } from 'ol';
import { Vector, Tile } from 'ol/layer';
import { Vector as VectorSource, OSM } from 'ol/source';
import { Select, Draw } from 'ol/interaction';
import GeometryType from 'ol/geom/GeometryType';

import Bar from 'ol-ext/control/Bar';
import Toggle from 'ol-ext/control/Toggle';
Expand Down Expand Up @@ -58,7 +57,7 @@ const pedit = new Toggle(
title: 'Point',
interaction: new Draw
({
type: GeometryType.POINT,
type: 'Point',
source: vector.getSource() as VectorSource<Geometry>
}),
onToggle(active) {
Expand Down
39 changes: 21 additions & 18 deletions examples/control/map.control.geobookmark.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
import { Map, View } from 'ol';
import { Tile, Vector } from 'ol/layer';
import { Stamen, OSM, Vector as VectorSource } from 'ol/source';
import { Tile } from 'ol/layer';
import { Stamen } from 'ol/source';
import GeoBookmark from 'ol-ext/control/GeoBookmark';
import { transform } from 'ol/proj';
// The map
var map = new Map
({ target: 'map',
view: new View ({ zoom: 13, center: [649083, 5408224] }),
layers: [new Tile({ source: new Stamen({ layer: 'watercolor' }) })]
});
var map = new Map
({
target: 'map',
view: new View({ zoom: 13, center: [649083, 5408224] }),
layers: [new Tile({ source: new Stamen({ layer: 'watercolor' }) })]
});

var bm = new GeoBookmark({ marks:
{ Paris: {pos: transform([2.351828, 48.856578], 'EPSG:4326', 'EPSG:3857'), zoom:11, permanent: true },
London: {pos: transform([-0.1275,51.507222], 'EPSG:4326', 'EPSG:3857'), zoom:11, permanent: true },
Geneve: {pos: transform([6.149985,46.200013], 'EPSG:4326', 'EPSG:3857'), zoom:13, permanent: true },
Bruxelles: {pos: transform([4.35,50.83], 'EPSG:4326', 'EPSG:3857'), zoom:12, permanent: true },
Berlin: {pos: transform([13.383333,52.516667], 'EPSG:4326', 'EPSG:3857'), zoom:12, permanent: true },
Madrid: {pos: transform([-3.683333,40.433333], 'EPSG:4326', 'EPSG:3857'), zoom:12 },
Roma: {pos: transform([12.48657,41.888732], 'EPSG:4326', 'EPSG:3857'), zoom:12 },
}
});
map.addControl(bm);
var bm = new GeoBookmark({
marks:
{
Paris: { pos: transform([2.351828, 48.856578], 'EPSG:4326', 'EPSG:3857'), zoom: 11, permanent: true },
London: { pos: transform([-0.1275, 51.507222], 'EPSG:4326', 'EPSG:3857'), zoom: 11, permanent: true },
Geneve: { pos: transform([6.149985, 46.200013], 'EPSG:4326', 'EPSG:3857'), zoom: 13, permanent: true },
Bruxelles: { pos: transform([4.35, 50.83], 'EPSG:4326', 'EPSG:3857'), zoom: 12, permanent: true },
Berlin: { pos: transform([13.383333, 52.516667], 'EPSG:4326', 'EPSG:3857'), zoom: 12, permanent: true },
Madrid: { pos: transform([-3.683333, 40.433333], 'EPSG:4326', 'EPSG:3857'), zoom: 12 },
Roma: { pos: transform([12.48657, 41.888732], 'EPSG:4326', 'EPSG:3857'), zoom: 12 },
}
});
map.addControl(bm);
41 changes: 24 additions & 17 deletions examples/control/map.switcher.popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ import LayerPopup from 'ol-ext/control/LayerPopup';

// Two base layers
const stamen = new Tile(
{ source: new Stamen({
{
source: new Stamen({
layer: 'watercolor'
})
});
stamen.set('title', "Watercolor");
stamen.set('baseLayer', true);

const stamen2 = new Tile(
{ visible: false,
{
visible: false,
source: new Stamen({
layer: 'toner'
})
Expand All @@ -24,38 +26,43 @@ stamen2.set('title', "Toner");
stamen2.set('baseLayer', true);

const osm = new Tile(
{ source: new OSM(),
{
source: new OSM(),
visible: false
});
osm.set('title', "OSM");
osm.set('baseLayer', true);

// GeoJSON layer with a preview attribute
const vectorSource = new VectorSource(
{ url: '../data/fond_guerre.geojson',
{
url: '../data/fond_guerre.geojson',
format: new GeoJSON({
dataProjection: 'EPSG:4326',
featureProjection: 'EPSG:3857'
}),
attributions: [ "&copy; <a href='https://data.culture.gouv.fr/explore/dataset/fonds-de-la-guerre-14-18-extrait-de-la-base-memoire'>" +
"<img src='https://data.culture.gouv.fr/assets/logo' height='12px'>data.culture.gouv.fr</a>" ],
attributions: ["&copy; <a href='https://data.culture.gouv.fr/explore/dataset/fonds-de-la-guerre-14-18-extrait-de-la-base-memoire'>" +
"<img src='https://data.culture.gouv.fr/assets/logo' height='12px'>data.culture.gouv.fr</a>"],
});

const vector = new Vector(
{ source: vectorSource
{
source: vectorSource
});
vector.set('name', '1914-18');
vector.set('preview', "http://www.culture.gouv.fr/Wave/image/memoire/2445/sap40_z0004141_v.jpg");

// The map
const map = new Map
({ target: 'map',
view: new View
({ zoom: 6,
center: [173664, 6166327]
}),
controls: control_defaults().extend
([ new LayerPopup(),
]),
layers: [stamen, stamen2, osm, vector]
});
({
target: 'map',
view: new View
({
zoom: 6,
center: [173664, 6166327]
}),
controls: control_defaults().extend
([new LayerPopup(),
]),
layers: [stamen, stamen2, osm, vector]
});
5 changes: 2 additions & 3 deletions examples/style/map.style.pattern.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { Tile, Vector } from 'ol/layer';
import { Stamen, Vector as VectorSource } from 'ol/source';
import { Fill, Icon, Style } from 'ol/style';
import { Draw } from 'ol/interaction';
import GeometryType from 'ol/geom/GeometryType';
import { Geometry, Polygon } from 'ol/geom';
import { Polygon } from 'ol/geom';

let refresh: any;
const imgFile = '../data/pattern.png';
Expand Down Expand Up @@ -122,7 +121,7 @@ $(window).on('load', () => {

// global so we can remove it later
const interaction = new Draw({
type: GeometryType.POLYGON,
type: 'Polygon',
source: vector.getSource() as VectorSource
});
map.addInteraction(interaction);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@siedlerchr/types-ol-ext",
"version": "2.1.2",
"version": "2.2.0",
"description": "Type definitions for ol-ext",
"main": "",
"types": "index.d.ts",
Expand Down

0 comments on commit 488174a

Please sign in to comment.