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.

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

Maplibre #203

Merged
merged 50 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
b2e4214
fix: update package-lock for version 12.0.0-alpha.2
boeckMt Aug 10, 2023
ad952a8
feat: export new type TFiltertypesUncap
boeckMt Aug 18, 2023
23894af
docs: description for create libraries and add examples to demo-maps
boeckMt Aug 21, 2023
0b5831c
feat: add place-label style for internal testing
boeckMt Aug 23, 2023
9713e5b
BREAKING CHANGE: remove exported Tgroupfiltertype from map-ol and map…
boeckMt Aug 18, 2023
0d217e3
docs: add change as a commit label for changes that only could introd…
boeckMt Aug 29, 2023
a7e4c6c
fix: budgets for demo-maps
boeckMt Aug 29, 2023
eea85fd
feat: New UKIS library export utilities for other libraries
boeckMt Sep 1, 2023
5cb85e3
fix: Merge conflict
boeckMt Sep 1, 2023
1399854
feat: create angular library for maplibre
boeckMt Aug 10, 2023
59bdc58
feat: add and extend @dlr-eoc/map-maplibre from internal repo
boeckMt Aug 23, 2023
5c5a39e
test: add tests for maplibre service
boeckMt Aug 23, 2023
7a08978
test: add tests for maplibre component
boeckMt Aug 23, 2023
f89df7e
test: add tests for maplibre layers helpers[201~
boeckMt Sep 1, 2023
880bafa
feat: add demo for maplibre
boeckMt Aug 28, 2023
ecd9ec1
fix: use min/max zoom from ukis layer
boeckMt Aug 28, 2023
1615ac6
fix: move layers and layergroups
boeckMt Aug 28, 2023
c35b3d0
refactor: use const for metadata
boeckMt Aug 28, 2023
71db991
refactor: export Specification from base helpers
boeckMt Aug 28, 2023
8952d41
refactor: rename groupId to ukisLayerId
boeckMt Aug 28, 2023
07f80c8
refactor: export get opacity from base helpers
boeckMt Aug 28, 2023
c753144
refactor: use createLayer from layer helpers
boeckMt Aug 28, 2023
255cb60
refactor: reuse getAllLayers
boeckMt Aug 29, 2023
f5d63fd
change: remove not used function
boeckMt Aug 29, 2023
1aa66c0
fix: remove source only if not used by another layer
boeckMt Aug 29, 2023
a4585f2
refactor: change order of layers function
boeckMt Aug 29, 2023
f56b8e3
refactor: use function to change order of layers
boeckMt Aug 29, 2023
6870e8d
test: add tests for maplibre helpers
boeckMt Aug 29, 2023
388f6da
fix: add devDependencies for test and build
boeckMt Aug 30, 2023
e3af0c3
refactor: remove not used import
boeckMt Aug 30, 2023
b3d61e8
test: add shared-assets to karma config
boeckMt Aug 30, 2023
68f6729
refactor: rename import
boeckMt Aug 31, 2023
aa35eb5
fix: use subdomains in wms
boeckMt Aug 31, 2023
5d7327b
feat: use bbox as bounds for vector and raster source and clusteroptions
boeckMt Aug 31, 2023
b0b50b0
feat: update layer parameters and sources
boeckMt Sep 1, 2023
bd85942
build: add deps for lib build
boeckMt Sep 1, 2023
e6b6d80
refactor: test aws open terrain-tiles
boeckMt Sep 1, 2023
c36263f
refactor: test update geojson layer
boeckMt Sep 1, 2023
a5ba808
feat: change style of map controls like map-ol
boeckMt Sep 1, 2023
86081f0
refactor: add test wms layer to switch styles
boeckMt Sep 1, 2023
f242a7b
refactor: load styles for cesium only on there route
boeckMt Aug 21, 2023
ff1f3b8
refactor: remove max width in demo maps cards
boeckMt Aug 21, 2023
ccf1695
test: fix destroy viewer after test - Too many active WebGL contexts,…
boeckMt Sep 1, 2023
d0edbae
Merge branch 'some-features' into maplibre
boeckMt Sep 1, 2023
76be31b
docs: hint for todo - replace function
boeckMt Sep 1, 2023
94f5fc3
refactor: remove not used function
boeckMt Sep 1, 2023
59b1307
fix: check for source before check diff
boeckMt Sep 1, 2023
d77f8b0
refactor: merge code from PR #202
boeckMt Sep 5, 2023
b4d07d7
refactor: generate tiles array in test
boeckMt Sep 5, 2023
7590429
fix: changed customLayer import.
lucas-angermann Nov 29, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
* **@dlr-eoc/utilities:**
- New UKIS library export utilities for other libraries.

* **@dlr-eoc/map-maplibre:**
- A example has been added to the demo-maps to show how to work with the new maplibre library.
- New UKIS library for working with [maplibre](https://maplibre.org/) was added.

* **@dlr-eoc/map-cesium:**
- New UKIS library for working with [CesiumJS](https://github.com/CesiumGS/cesium) was added.

Expand Down
378 changes: 354 additions & 24 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@
"projects/map-three",
"projects/shared-assets",
"projects/map-cesium",
"projects/utilities"
"projects/utilities",
"projects/map-maplibre"
],
"engines": {
"node": ">= 18.13.0",
Expand Down
3 changes: 2 additions & 1 deletion projects/demo-maps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"@dlr-eoc/utils-maps": "12.0.0-alpha.2",
"@dlr-eoc/services-ogc": "12.0.0-alpha.2",
"@dlr-eoc/shared-assets": "12.0.0-alpha.2",
"@dlr-eoc/map-cesium": "12.0.0-alpha.2"
"@dlr-eoc/map-cesium": "12.0.0-alpha.2",
"@dlr-eoc/map-maplibre": "12.0.0-alpha.2"
},
"devDependencies": {
"zone.js": "^0.11.7",
Expand Down
9 changes: 9 additions & 0 deletions projects/demo-maps/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ const routes: Routes = [
img: 'assets/route-cesium.jpg'
}
},
{
path: 'maplibre',
loadChildren: () => import('./route-components/route-example-maplibre/route-example-maplibre.module').then(m => m.RouteExampleMaplibreModule),
data: {
title: 'Maplibre',
description: 'This example shows a maplibre map and how to work with UKIS layers',
img: 'assets/route-maplibre.jpg'
}
},
{
path: 'licenses',
loadChildren: () => import('./route-components/route-licenses/route-licenses.module').then(m => m.RouteLicensesModule),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<section class="content-area map-view">
<ukis-map-maplibre [mapState]="mapStateSvc" [layersSvc]="layerSvc"></ukis-map-maplibre>
</section>

<clr-vertical-nav class="right" [clrVerticalNavCollapsible]="true">

<clr-vertical-nav-group [clrVerticalNavGroupExpanded]="true" class="layers">
<clr-icon shape="world" title="Overlays" clrVerticalNavIcon></clr-icon>
Overlays
<clr-vertical-nav-group-children class="padding title-ellipsis">
<ukis-layer-control [layersSvc]="layerSvc" [mapStateSvc]="mapStateSvc" [layerfilter]="'Overlays'">
</ukis-layer-control>
</clr-vertical-nav-group-children>
</clr-vertical-nav-group>

<clr-vertical-nav-group [clrVerticalNavGroupExpanded]="true" class="layers">
<clr-icon shape="layers" clrVerticalNavIcon title="layers"></clr-icon>
Layers
<clr-vertical-nav-group-children class="padding title-ellipsis">
<ukis-layer-control [layersSvc]="layerSvc" [mapStateSvc]="mapStateSvc"></ukis-layer-control>
</clr-vertical-nav-group-children>
</clr-vertical-nav-group>

<clr-vertical-nav-group [clrVerticalNavGroupExpanded]="true" class="layers">
<clr-icon shape="world" title="Baselayers" clrVerticalNavIcon></clr-icon>
Baselayers
<clr-vertical-nav-group-children class="padding title-ellipsis">
<ukis-base-layer-control [layersSvc]="layerSvc" [mapStateSvc]="mapStateSvc"></ukis-base-layer-control>
</clr-vertical-nav-group-children>
</clr-vertical-nav-group>

<clr-vertical-nav-group [clrVerticalNavGroupExpanded]="true" class="layers">
<clr-icon shape="cog" title="Actions" clrVerticalNavIcon></clr-icon>
Actions
<clr-vertical-nav-group-children class="padding title-ellipsis">

<button class="btn btn-primary" (click)="updateLayer()">update Geojson Layer</button>

</clr-vertical-nav-group-children>
</clr-vertical-nav-group>

</clr-vertical-nav>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'maplibre-gl/dist/maplibre-gl.css';
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { RouteExampleMaplibreComponent } from './route-example-maplibre.component';

describe('RouteExampleMaplibreComponent', () => {
let component: RouteExampleMaplibreComponent;
let fixture: ComponentFixture<RouteExampleMaplibreComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ RouteExampleMaplibreComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(RouteExampleMaplibreComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Loading