Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/quick-bobcats-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@getodk/web-forms': patch
---

Adds map tile attribution
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 28 additions & 1 deletion packages/web-forms/src/components/common/map/MapBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ const discardSavedFeature = () => {
.map-block-component :deep(.ol-zoom) {
position: absolute;
right: var(--odk-map-spacing);
bottom: var(--odk-map-spacing);
bottom: 35px;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
Expand Down Expand Up @@ -234,6 +234,33 @@ const discardSavedFeature = () => {
}
}

.map-block-component :deep(.ol-attribution) {
position: absolute;
right: 0;
bottom: 0;
background: rgba(245, 245, 245, 0.8);

button {
display: none;
}

ul {
margin: 0;
padding: 5px;
}

li {
list-style: none;
}

li,
a {
font-size: 10px;
line-height: 14px;
color: var(--odk-muted-text-color);
}
}

.map-block-error {
font-size: var(--odk-base-font-size);
color: var(--odk-error-text-color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,18 @@ const orderedProps = computed(() => {
margin: 0;

.property-line {
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
gap: 5px;
display: block;
padding: 15px 0;

dt,
dd {
display: inline;
margin: 0;
}

dt:after {
content: ':';
margin-right: 5px;
}

&:not(:last-child) {
Expand Down
4 changes: 2 additions & 2 deletions packages/web-forms/src/components/common/map/useMapBlock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@/components/common/map/map-styles.ts';
import type { FeatureCollection } from 'geojson';
import { Map, MapBrowserEvent, View } from 'ol';
import { Zoom } from 'ol/control';
import { Attribution, Zoom } from 'ol/control';
import { getCenter } from 'ol/extent';
import Feature from 'ol/Feature';
import GeoJSON from 'ol/format/GeoJSON';
Expand Down Expand Up @@ -76,7 +76,7 @@ export function useMapBlock() {
projection: DEFAULT_VIEW_PROJECTION,
extent: getProjection(DEFAULT_VIEW_PROJECTION)?.getExtent(),
}),
controls: [new Zoom()],
controls: [new Zoom(), new Attribution({ collapsible: false })],
});

currentState.value = STATES.READY;
Expand Down
Loading