Skip to content

Commit c775c9a

Browse files
authored
Merge pull request #119 from SDFIdk/ccby
update attribution
2 parents 346183b + 2e2e4cc commit c775c9a

34 files changed

+270
-174
lines changed

DEVELOPING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ I konsolen:
1818
```
1919
npm run dev
2020
```
21-
Det starter en udviklingsserver, så du kan åbne eksempel-sider i en browser; f.eks. på [localhost:8000/examples/simple.html].
21+
Det starter en udviklingsserver, så du kan åbne eksempel-sider i en browser; f.eks. på [localhost:8000/docs/simple.html].
2222

2323
Så længe den kører, vil den automatisk bygge med nye ændringer du laver i `/src`.
24-
HTML-eksemplerne i `/examples` bliver dog ikke opdateret, med mindre du kører `npm run build`
24+
HTML-eksemplerne i `/docs` bliver dog ikke opdateret, med mindre du kører `npm run build`
2525

2626
## Byg til prod
2727

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Før brug skal man oprette en bruger på [Dataforsyningen](https://dataforsyning
1313
1. Opret en bruger på [Dataforsyningen](https://www.dataforsyningen.dk)
1414
2. Log ind på dataforsyningen.dk med din nye bruger, og opret en token.
1515
3. Indsæt `<script>`-tag på din hjemmeside
16-
- Benyt enten vores CDN: `<script type="module">import {Initialize} from "https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.2.0"</script>`
16+
- Benyt enten vores CDN: `<script type="module">import {Initialize} from "https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.3.0"</script>`
1717
- Eller hav filen liggende på din egen server: `<script src="/path/to/index.js"></script>`
1818
4. Indsæt `<div id="map" class="geomap" data-token="...">`-tag, dér hvor du vil have kortet.
1919
- Husk at indsætte din egen token i `data-token`-attributten.
@@ -77,7 +77,7 @@ Brug OKAPI CSS og JS direkte fra CDN:
7777
```html
7878
<head>
7979
...
80-
<link href="https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.2.0/dist/okapi.min.css" rel="stylesheet">
80+
<link href="https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.3.0/dist/okapi.min.css" rel="stylesheet">
8181
...
8282
</head>
8383
<body>
@@ -89,7 +89,7 @@ Brug OKAPI CSS og JS direkte fra CDN:
8989
</div>
9090

9191
<script type="module">
92-
import { Initialize } from 'https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.2.0'
92+
import { Initialize } from 'https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.3.0'
9393
new Initialize({})
9494
</script>
9595

@@ -98,7 +98,7 @@ Brug OKAPI CSS og JS direkte fra CDN:
9898

9999
### CSS
100100

101-
Vores standard styling kan findes her: https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.2.0/dist/okapi.min.css
101+
Vores standard styling kan findes her: https://cdn.jsdelivr.net/npm/@dataforsyningen/okapi@2.3.0/dist/okapi.min.css
102102

103103
## Anvendelse
104104

dist/okapi.css

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/okapi.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/okapi.js

Lines changed: 51 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25176,32 +25176,12 @@ var Resolutions = [1638.4, 819.2, 409.6, 204.8, 102.4, 51.2, 25.6, 12.8, 6.4, 3.
2517625176
var MatrixIds = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13"];
2517725177
var Size = [256, 256];
2517825178

25179-
// src/utility/IsMobile.js
25180-
var Android = function() {
25181-
return navigator.userAgent.match(/Android/i) && navigator.userAgent.match(/Mobile/i);
25182-
};
25183-
var BlackBerry = function() {
25184-
return navigator.userAgent.match(/BlackBerry/i);
25185-
};
25186-
var iOS = function() {
25187-
return navigator.userAgent.match(/iPhone|iPod/i);
25188-
};
25189-
var Opera = function() {
25190-
return navigator.userAgent.match(/Opera Mini/i);
25191-
};
25192-
var Windows = function() {
25193-
return navigator.userAgent.match(/IEMobile/i);
25194-
};
25195-
var any = function() {
25196-
return Android() || BlackBerry() || iOS() || Opera() || Windows();
25197-
};
25198-
2519925179
// src/CreateLayer.js
25200-
var kfText = any() ? "SDFI" : "Styrelsen for Dataforsyning og Infrastruktur";
25201-
var kfLink = "https://download.dataforsyningen.dk/content/vilk%C3%A5r-og-betingelser";
25202-
var kfAttributionText = '&copy; <a target="_blank" href="' + kfLink + '">' + kfText + "</a>";
25203-
var dfLink = "https://datafordeler.dk/vejledning/brugervilkaar/sdfi-geografiske-data/";
25204-
var dfAttributionText = '&copy; <a target="_blank" href="' + dfLink + '">' + kfText + "</a>";
25180+
var ccbyText = "(CC BY)";
25181+
var ccbyLink = "https://creativecommons.org/licenses/by/4.0/deed.da";
25182+
var createAttribution = function(link, text) {
25183+
return '<a target="_blank" href="' + ccbyLink + '">' + ccbyText + '</a> <a target="_blank" href="' + link + '">' + text + "</a>";
25184+
};
2520525185
var createUrl = function(service, auth) {
2520625186
if (auth.source === "kf") {
2520725187
const baseUrl = "https://api.dataforsyningen.dk/";
@@ -25227,7 +25207,7 @@ var createLayer2 = function(opt) {
2522725207
const matrixSet = opt.matrixSet;
2522825208
const format = opt.format || "";
2522925209
const tileGrid = opt.tileGrid;
25230-
const attributionText = opt.auth.source === "kf" ? kfAttributionText : opt.auth.source === "df" ? dfAttributionText : opt.attribution;
25210+
const attributionText = createAttribution(opt.attribution.link, opt.attribution.text);
2523125211
let source = null;
2523225212
if (type === "WMTS") {
2523325213
source = new WMTS_default2({
@@ -25419,7 +25399,11 @@ var Map2 = class {
2541925399
matrixSet: "View1",
2542025400
format: "image/jpeg",
2542125401
tileGrid: dfTileGrid,
25422-
auth: dfAuth
25402+
auth: dfAuth,
25403+
attribution: {
25404+
link: "https://dataforsyningen.dk/data/962",
25405+
text: "KDS"
25406+
}
2542325407
}));
2542425408
layers.push(createLayer2({
2542525409
name: "dtk_skaermkort_daempet",
@@ -25431,7 +25415,11 @@ var Map2 = class {
2543125415
matrixSet: "View1",
2543225416
format: "image/jpeg",
2543325417
tileGrid: dfTileGrid,
25434-
auth: dfAuth
25418+
auth: dfAuth,
25419+
attribution: {
25420+
link: "https://dataforsyningen.dk/data/962",
25421+
text: "KDS"
25422+
}
2543525423
}));
2543625424
layers.push(createLayer2({
2543725425
name: "orto_foraar",
@@ -25444,7 +25432,11 @@ var Map2 = class {
2544425432
matrixSet: "KortforsyningTilingDK",
2544525433
format: "image/jpeg",
2544625434
tileGrid: dfTileGrid,
25447-
auth: dfAuth
25435+
auth: dfAuth,
25436+
attribution: {
25437+
link: "https://dataforsyningen.dk/data/981",
25438+
text: "GeoDanmark"
25439+
}
2544825440
}));
2544925441
} else if (this._token) {
2545025442
layers.push(createLayer2({
@@ -25457,7 +25449,11 @@ var Map2 = class {
2545725449
matrixSet: "View1",
2545825450
format: "image/jpeg",
2545925451
tileGrid: kfTileGrid,
25460-
auth: kfAuth
25452+
auth: kfAuth,
25453+
attribution: {
25454+
link: "https://dataforsyningen.dk/data/962",
25455+
text: "KDS"
25456+
}
2546125457
}));
2546225458
layers.push(createLayer2({
2546325459
name: "dtk_skaermkort_daempet",
@@ -25469,7 +25465,11 @@ var Map2 = class {
2546925465
matrixSet: "View1",
2547025466
format: "image/jpeg",
2547125467
tileGrid: kfTileGrid,
25472-
auth: kfAuth
25468+
auth: kfAuth,
25469+
attribution: {
25470+
link: "https://dataforsyningen.dk/data/962",
25471+
text: "KDS"
25472+
}
2547325473
}));
2547425474
layers.push(createLayer2({
2547525475
name: "orto_foraar",
@@ -25482,7 +25482,11 @@ var Map2 = class {
2548225482
matrixSet: "KortforsyningTilingDK",
2548325483
format: "image/jpeg",
2548425484
tileGrid: kfTileGrid,
25485-
auth: kfAuth
25485+
auth: kfAuth,
25486+
attribution: {
25487+
link: "https://dataforsyningen.dk/data/981",
25488+
text: "GeoDanmark"
25489+
}
2548625490
}));
2548725491
}
2548825492
if (this._token) {
@@ -25494,7 +25498,11 @@ var Map2 = class {
2549425498
service: "forvaltning2",
2549525499
layer: "basis_kort",
2549625500
format: "image/png",
25497-
auth: kfAuth
25501+
auth: kfAuth,
25502+
attribution: {
25503+
link: "https://dataforsyningen.dk/data/2680",
25504+
text: "KDS"
25505+
}
2549825506
}));
2549925507
layers.push(createLayer2({
2550025508
name: "kommunikation",
@@ -25504,7 +25512,11 @@ var Map2 = class {
2550425512
service: "kommunikation",
2550525513
layer: "Kommunikationskort",
2550625514
format: "image/png",
25507-
auth: kfAuth
25515+
auth: kfAuth,
25516+
attribution: {
25517+
link: "https://dataforsyningen.dk/data/4690",
25518+
text: "KDS"
25519+
}
2550825520
}));
2550925521
layers.push(createLayer2({
2551025522
name: "natur_friluftskort",
@@ -25516,7 +25528,11 @@ var Map2 = class {
2551625528
matrixSet: "View1",
2551725529
format: "image/jpeg",
2551825530
tileGrid: kfTileGrid2,
25519-
auth: kfAuth
25531+
auth: kfAuth,
25532+
attribution: {
25533+
link: "https://dataforsyningen.dk/data/2683",
25534+
text: "KDS"
25535+
}
2552025536
}));
2552125537
}
2552225538
const overlays = [];

dist/okapi.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)