@geolonia/embed 4.2.1 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/embed +1 -1
- package/dist/embed.js +1 -1
- package/dist/lib/CustomAttributionControl.d.ts +2 -0
- package/dist/lib/util.d.ts +1 -0
- package/dist/version.d.ts +1 -1
- package/package.json +3 -3
- package/src/lib/CustomAttributionControl.ts +20 -0
- package/src/lib/geolonia-map.ts +13 -6
- package/src/lib/render.ts +12 -2
- package/src/lib/simplestyle-vector.ts +3 -3
- package/src/lib/simplestyle.ts +3 -10
- package/src/lib/util.ts +19 -0
- package/src/style.css +34 -0
|
@@ -31,6 +31,8 @@ declare class CustomAttributionControl implements IControl {
|
|
|
31
31
|
private _attribHTML;
|
|
32
32
|
private styleId;
|
|
33
33
|
private styleOwner;
|
|
34
|
+
private printQuery;
|
|
35
|
+
private onMediaPrintChange;
|
|
34
36
|
constructor(options?: {});
|
|
35
37
|
getDefaultPosition(): ControlPosition;
|
|
36
38
|
onAdd(map: any): any;
|
package/dist/lib/util.d.ts
CHANGED
|
@@ -53,5 +53,6 @@ export declare function parseControlOption(att: any): {
|
|
|
53
53
|
export declare const getSessionId: (digit: any) => string;
|
|
54
54
|
export declare const parseSimpleVector: (attributeValue: any) => any;
|
|
55
55
|
export declare const handleRestrictedMode: (map: any) => void;
|
|
56
|
+
export declare const handleErrorMode: (container: any) => void;
|
|
56
57
|
export declare const sanitizeDescription: (description: any) => Promise<any>;
|
|
57
58
|
export declare const random: (max: number) => number;
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const VERSION = "4.
|
|
1
|
+
export declare const VERSION = "4.3.0";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@geolonia/embed",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"description": "Geolonia embed JS API",
|
|
5
5
|
"main": "dist/embed.js",
|
|
6
6
|
"types": "dist/embed.d.ts",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"@mapbox/geojson-extent": "^1.0.0",
|
|
54
54
|
"@mapbox/point-geometry": "^0.1.0",
|
|
55
55
|
"@turf/center": "^6.0.1",
|
|
56
|
-
"maplibre-gl": "3.
|
|
57
|
-
"pmtiles": "
|
|
56
|
+
"maplibre-gl": "3.4.1",
|
|
57
|
+
"pmtiles": "2.11.0",
|
|
58
58
|
"sanitize-html": "^2.8.0",
|
|
59
59
|
"tinycolor2": "^1.4.1"
|
|
60
60
|
}
|
|
@@ -35,6 +35,8 @@ class CustomAttributionControl implements IControl {
|
|
|
35
35
|
private _attribHTML;
|
|
36
36
|
private styleId;
|
|
37
37
|
private styleOwner;
|
|
38
|
+
private printQuery;
|
|
39
|
+
private onMediaPrintChange;
|
|
38
40
|
|
|
39
41
|
constructor(options = {}) {
|
|
40
42
|
this.options = options;
|
|
@@ -190,6 +192,12 @@ class CustomAttributionControl implements IControl {
|
|
|
190
192
|
}
|
|
191
193
|
}
|
|
192
194
|
|
|
195
|
+
@media print {
|
|
196
|
+
.maplibregl-ctrl-attrib-button {
|
|
197
|
+
display: none!important;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
|
|
193
201
|
.maplibregl-ctrl-attrib a {
|
|
194
202
|
color: rgba(0,0,0,.75);
|
|
195
203
|
text-decoration: none;
|
|
@@ -218,6 +226,16 @@ class CustomAttributionControl implements IControl {
|
|
|
218
226
|
shadow.appendChild(style);
|
|
219
227
|
shadow.appendChild(this._shadowContainer);
|
|
220
228
|
|
|
229
|
+
this.printQuery = window.matchMedia('print');
|
|
230
|
+
this.onMediaPrintChange = (e) => {
|
|
231
|
+
if (e.matches) {
|
|
232
|
+
// force open
|
|
233
|
+
this._shadowContainer.setAttribute('open', '');
|
|
234
|
+
this._shadowContainer.classList.remove('maplibregl-compact-show');
|
|
235
|
+
}
|
|
236
|
+
};
|
|
237
|
+
this.printQuery.addEventListener('change', this.onMediaPrintChange);
|
|
238
|
+
|
|
221
239
|
return this._container;
|
|
222
240
|
}
|
|
223
241
|
|
|
@@ -233,6 +251,8 @@ class CustomAttributionControl implements IControl {
|
|
|
233
251
|
this._map = undefined;
|
|
234
252
|
this._compact = undefined;
|
|
235
253
|
this._attribHTML = undefined;
|
|
254
|
+
|
|
255
|
+
this.printQuery.removeEventListener('change', this.onMediaPrintChange);
|
|
236
256
|
}
|
|
237
257
|
|
|
238
258
|
_setElementTitle(element, title) {
|
package/src/lib/geolonia-map.ts
CHANGED
|
@@ -8,7 +8,7 @@ import parseAtts from './parse-atts';
|
|
|
8
8
|
import { SimpleStyle } from './simplestyle';
|
|
9
9
|
import SimpleStyleVector from './simplestyle-vector';
|
|
10
10
|
|
|
11
|
-
import { getContainer, getOptions, getSessionId, getStyle, handleRestrictedMode, isScrollable, parseControlOption, parseSimpleVector } from './util';
|
|
11
|
+
import { getContainer, getOptions, getSessionId, getStyle, handleRestrictedMode, isScrollable, parseControlOption, parseSimpleVector, handleErrorMode } from './util';
|
|
12
12
|
|
|
13
13
|
import type { MapOptions, PointLike, StyleOptions, StyleSpecification, StyleSwapOptions } from 'maplibre-gl';
|
|
14
14
|
|
|
@@ -46,10 +46,11 @@ export default class GeoloniaMap extends maplibregl.Map {
|
|
|
46
46
|
private __styleExtensionLoadRequired: boolean;
|
|
47
47
|
|
|
48
48
|
constructor(params: string | GeoloniaMapOptions) {
|
|
49
|
+
|
|
49
50
|
const container = getContainer(params) as Container | false;
|
|
50
51
|
|
|
51
52
|
if (!container) {
|
|
52
|
-
if (
|
|
53
|
+
if (typeof params === 'string') {
|
|
53
54
|
throw new Error(`[Geolonia] No HTML elements found matching \`${params}\`. Please ensure the map container element exists.`);
|
|
54
55
|
} else {
|
|
55
56
|
throw new Error('[Geolonia] No HTML elements found. Please ensure the map container element exists.');
|
|
@@ -142,8 +143,14 @@ export default class GeoloniaMap extends maplibregl.Map {
|
|
|
142
143
|
return request;
|
|
143
144
|
};
|
|
144
145
|
|
|
145
|
-
|
|
146
|
-
|
|
146
|
+
try {
|
|
147
|
+
// Generate Map
|
|
148
|
+
super(options);
|
|
149
|
+
} catch (error) {
|
|
150
|
+
handleErrorMode(container);
|
|
151
|
+
throw error;
|
|
152
|
+
}
|
|
153
|
+
|
|
147
154
|
const map = this;
|
|
148
155
|
this.geoloniaSourcesUrl = sourcesUrl;
|
|
149
156
|
this.__styleExtensionLoadRequired = true;
|
|
@@ -151,7 +158,7 @@ export default class GeoloniaMap extends maplibregl.Map {
|
|
|
151
158
|
// Note: GeoloniaControl should be placed before another controls.
|
|
152
159
|
// Because this control should be "very" bottom-left(default) or the attributed position.
|
|
153
160
|
const { position: geoloniaControlPosition } = parseControlOption(atts.geoloniaControl);
|
|
154
|
-
map.addControl(new GeoloniaControl(),
|
|
161
|
+
map.addControl(new GeoloniaControl(), geoloniaControlPosition);
|
|
155
162
|
|
|
156
163
|
map.addControl(new CustomAttributionControl(), 'bottom-right');
|
|
157
164
|
|
|
@@ -172,7 +179,7 @@ export default class GeoloniaMap extends maplibregl.Map {
|
|
|
172
179
|
|
|
173
180
|
const { enabled: scaleControlEnabled, position: scaleControlPosition } = parseControlOption(atts.scaleControl);
|
|
174
181
|
if (scaleControlEnabled) {
|
|
175
|
-
map.addControl(new ScaleControl({}),
|
|
182
|
+
map.addControl(new ScaleControl({}), scaleControlPosition);
|
|
176
183
|
}
|
|
177
184
|
|
|
178
185
|
map.on('load', (event) => {
|
package/src/lib/render.ts
CHANGED
|
@@ -67,7 +67,12 @@ export const renderGeoloniaMap = () => {
|
|
|
67
67
|
if (!item.isIntersecting) {
|
|
68
68
|
return;
|
|
69
69
|
}
|
|
70
|
-
|
|
70
|
+
try {
|
|
71
|
+
renderSingleMap(item.target);
|
|
72
|
+
} catch (e) {
|
|
73
|
+
// Not throw error because, following maps will not be rendered.
|
|
74
|
+
console.error('[Geolonia] Failed to initialize map', e); // eslint-disable-line
|
|
75
|
+
}
|
|
71
76
|
observer.unobserve(item.target);
|
|
72
77
|
});
|
|
73
78
|
});
|
|
@@ -82,7 +87,12 @@ export const renderGeoloniaMap = () => {
|
|
|
82
87
|
|
|
83
88
|
// render Map immediately
|
|
84
89
|
for (let i = 0; i < containers.length; i++) {
|
|
85
|
-
|
|
90
|
+
try {
|
|
91
|
+
renderSingleMap(containers[i]);
|
|
92
|
+
} catch (e) {
|
|
93
|
+
// Not throw error because, following maps will not be rendered.
|
|
94
|
+
console.error('[Geolonia] Failed to initialize map', e); // eslint-disable-line
|
|
95
|
+
}
|
|
86
96
|
}
|
|
87
97
|
|
|
88
98
|
// set intersection observer
|
|
@@ -190,9 +190,9 @@ class SimpleStyleVector {
|
|
|
190
190
|
'text-max-width': 12,
|
|
191
191
|
'text-offset': [
|
|
192
192
|
'case',
|
|
193
|
-
['==', 'small', ['get', 'marker-size']], ['literal', [0,
|
|
194
|
-
['==', 'large', ['get', 'marker-size']], ['literal', [0, 1.
|
|
195
|
-
['literal', [0,
|
|
193
|
+
['==', 'small', ['get', 'marker-size']], ['literal', [0, 1]],
|
|
194
|
+
['==', 'large', ['get', 'marker-size']], ['literal', [0, 1.6]],
|
|
195
|
+
['literal', [0, 1.2]],
|
|
196
196
|
],
|
|
197
197
|
'text-allow-overlap': false,
|
|
198
198
|
},
|
package/src/lib/simplestyle.ts
CHANGED
|
@@ -230,22 +230,15 @@ export class SimpleStyle {
|
|
|
230
230
|
'text-field': ['get', 'title'],
|
|
231
231
|
'text-font': ['Noto Sans Regular'],
|
|
232
232
|
'text-size': 12,
|
|
233
|
-
'text-anchor': 'top',
|
|
234
233
|
'text-max-width': 12,
|
|
235
|
-
'text-offset': [
|
|
236
|
-
'case',
|
|
237
|
-
['==', 'small', ['get', 'marker-size']], ['literal', [0, 0.6]],
|
|
238
|
-
['==', 'large', ['get', 'marker-size']], ['literal', [0, 1.2]],
|
|
239
|
-
['literal', [0, 0.8]],
|
|
240
|
-
],
|
|
241
234
|
'text-allow-overlap': true,
|
|
242
235
|
'icon-allow-overlap': true,
|
|
243
236
|
'text-variable-anchor': ['top', 'bottom', 'left', 'right'],
|
|
244
237
|
'text-radial-offset': [
|
|
245
238
|
'case',
|
|
246
|
-
['==', 'small', ['get', 'marker-size']],
|
|
247
|
-
['==', 'large', ['get', 'marker-size']], 1.
|
|
248
|
-
|
|
239
|
+
['==', 'small', ['get', 'marker-size']], 1,
|
|
240
|
+
['==', 'large', ['get', 'marker-size']], 1.6,
|
|
241
|
+
1.2,
|
|
249
242
|
],
|
|
250
243
|
},
|
|
251
244
|
});
|
package/src/lib/util.ts
CHANGED
|
@@ -272,6 +272,24 @@ export const handleRestrictedMode = (map) => {
|
|
|
272
272
|
}
|
|
273
273
|
};
|
|
274
274
|
|
|
275
|
+
export const handleErrorMode = (container) => {
|
|
276
|
+
|
|
277
|
+
const errorContainer = document.createElement('div');
|
|
278
|
+
errorContainer.classList.add('geolonia__error-container');
|
|
279
|
+
|
|
280
|
+
const div = document.createElement('div');
|
|
281
|
+
|
|
282
|
+
const h1 = document.createElement('h2');
|
|
283
|
+
h1.textContent = 'Geolonia Maps';
|
|
284
|
+
div.appendChild(h1);
|
|
285
|
+
|
|
286
|
+
div.classList.add('geolonia__error-message');
|
|
287
|
+
div.innerHTML += '<div class="geolonia__error-message-description">地図の初期化に失敗しました。管理者にお問い合わせ下さい。開発者の方は開発者ツールでエラー詳細をご確認下さい。</div>';
|
|
288
|
+
|
|
289
|
+
errorContainer.appendChild(div);
|
|
290
|
+
container.appendChild(errorContainer);
|
|
291
|
+
};
|
|
292
|
+
|
|
275
293
|
export const sanitizeDescription = async (description) => {
|
|
276
294
|
const { default: sanitizeHtml } = await import('sanitize-html');
|
|
277
295
|
return sanitizeHtml(description, {
|
|
@@ -281,3 +299,4 @@ export const sanitizeDescription = async (description) => {
|
|
|
281
299
|
};
|
|
282
300
|
|
|
283
301
|
export const random = (max: number): number => Math.floor(Math.random() * max);
|
|
302
|
+
|
package/src/style.css
CHANGED
|
@@ -110,6 +110,34 @@
|
|
|
110
110
|
background-size: cover;
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
+
/* Style for error message */
|
|
114
|
+
.geolonia__error-container {
|
|
115
|
+
display: flex;
|
|
116
|
+
justify-content: center;
|
|
117
|
+
align-items: center;
|
|
118
|
+
height: 100%;
|
|
119
|
+
width: 100%;
|
|
120
|
+
background-color: #dedede;
|
|
121
|
+
z-index: 9999;
|
|
122
|
+
position: absolute;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
.geolonia__error-message {
|
|
126
|
+
max-width: 300px;
|
|
127
|
+
background-color: #ffffff;
|
|
128
|
+
margin: 10px;
|
|
129
|
+
padding: 0.75rem 1.25rem;
|
|
130
|
+
border-radius: 6px;
|
|
131
|
+
position: absolute;
|
|
132
|
+
z-index: 99999;
|
|
133
|
+
word-wrap: break-word;
|
|
134
|
+
box-shadow: 0 4px 10px #0000001a
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
.geolonia__error-message-description {
|
|
138
|
+
margin: 15px 0;
|
|
139
|
+
}
|
|
140
|
+
|
|
113
141
|
/* CSS for Attribution */
|
|
114
142
|
/* Fix: https://github.com/geolonia/embed/issues/291 */
|
|
115
143
|
.maplibregl-map {
|
|
@@ -129,3 +157,9 @@
|
|
|
129
157
|
display: block!important;
|
|
130
158
|
}
|
|
131
159
|
/* End: CSS for Attribution */
|
|
160
|
+
|
|
161
|
+
@media print {
|
|
162
|
+
.maplibregl-control-container button {
|
|
163
|
+
display: none;
|
|
164
|
+
}
|
|
165
|
+
}
|