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

fix(map): Add attributions (OSM and Carto) #890

Merged
merged 4 commits into from
May 29, 2024
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
6 changes: 6 additions & 0 deletions libs/feature/map/src/lib/map-context/map-context.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,35 @@ export interface MapContextLayerWmsModel {
type: 'wms'
url: string
name: string
attributions?: string
}

export interface MapContextLayerWmtsModel {
type: 'wmts'
url: string
name: string
attributions?: string
}

interface MapContextLayerWfsModel {
type: 'wfs'
url: string
name: string
attributions?: string
}

export interface MapContextLayerOgcapiModel {
type: 'ogcapi'
url: string
name: string
layerType: 'feature' | 'vectorTiles' | 'mapTiles' | 'record'
attributions?: string
}

interface LayerXyzModel {
type: 'xyz'
name?: string
attributions?: string
}
interface LayerXyzModelWithUrl extends LayerXyzModel {
url: string
Expand All @@ -59,6 +64,7 @@ export type MapContextLayerXyzModel =

interface LayerGeojson {
type: 'geojson'
attributions?: string
}
interface LayerGeojsonWithUrl extends LayerGeojson {
url: string
Expand Down
8 changes: 8 additions & 0 deletions libs/feature/map/src/lib/map-context/map-context.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const DEFAULT_BASELAYER_CONTEXT: MapContextLayerXyzModel = {
`https://b.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
`https://c.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png`,
],
attributions: `<span>© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, © <a href="https://carto.com/">Carto</a></span>`,
}

export const DEFAULT_VIEW: MapContextViewModel = {
Expand Down Expand Up @@ -87,19 +88,22 @@ export class MapContextService {
source: new OGCVectorTile({
url: layerModel.url,
format: new MVT(),
attributions: layerModel.attributions,
}),
})
} else if (layerModel.layerType === 'mapTiles') {
return new TileLayer({
source: new OGCMapTile({
url: layerModel.url,
attributions: layerModel.attributions,
}),
})
} else {
return new VectorLayer({
source: new VectorSource({
format: new GeoJSON(),
url: layerModel.url,
attributions: layerModel.attributions,
}),
style,
})
Expand All @@ -109,6 +113,7 @@ export class MapContextService {
source: new XYZ({
url: 'url' in layerModel ? layerModel.url : undefined,
urls: 'urls' in layerModel ? layerModel.urls : undefined,
attributions: layerModel.attributions,
}),
})
case MapContextLayerTypeEnum.WMS:
Expand All @@ -117,6 +122,7 @@ export class MapContextService {
url: layerModel.url,
params: { LAYERS: layerModel.name },
gutter: 20,
attributions: layerModel.attributions,
}),
})
case MapContextLayerTypeEnum.WMTS: {
Expand All @@ -141,6 +147,7 @@ export class MapContextService {
tileGrid,
projection: matrixSet.crs,
dimensions,
attributions: layerModel.attributions,
})
)
})
Expand All @@ -166,6 +173,7 @@ export class MapContextService {
})
},
strategy: bboxStrategy,
attributions: layerModel.attributions,
})
)
})
Expand Down
2 changes: 1 addition & 1 deletion libs/feature/map/src/lib/utils/map-utils.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ describe('MapUtilsService', () => {
expect(map).toBeInstanceOf(Map)
})
it('with no control', () => {
expect(map.getControls().getArray().length).toBe(0)
expect(map.getControls().getArray().length).toBe(3)
})
it('with no layer', () => {
expect(map.getLayers().getArray().length).toBe(0)
Expand Down
6 changes: 5 additions & 1 deletion libs/feature/map/src/lib/utils/map-utils.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
MapContextLayerWmsModel,
} from '../map-context/map-context.model'
import Collection from 'ol/Collection'
import { defaults as defaultControls } from 'ol/control.js'
import MapBrowserEvent from 'ol/MapBrowserEvent'
import { CatalogRecord } from '@geonetwork-ui/common/domain/model/record'
import { ProxyService } from '@geonetwork-ui/util/shared'
Expand All @@ -47,7 +48,10 @@ export class MapUtilsService {

createEmptyMap(): Map {
return new Map({
controls: [],
controls: defaultControls({
attribution: true,
attributionOptions: { collapsible: false },
}),
pixelRatio: 1,
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export const Primary: StoryObj<UserFeedbackItemComponent> = {
authorEmail: '',
},
],
isActiveUserEditor: true,
activeUser: {
id: '1',
email: '[email protected]',
Expand Down
Loading