Skip to content

Commit 4d8d82f

Browse files
fix: address review suggestions
1 parent 6749ef6 commit 4d8d82f

File tree

4 files changed

+7
-40
lines changed

4 files changed

+7
-40
lines changed

packages/core/lib/utils/url.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,3 @@ export function removeSearchParams(
1818
toDelete.map((param) => urlObj.searchParams.delete(param));
1919
return urlObj.toString();
2020
}
21-
22-
export function getSearchParams(
23-
url: string,
24-
paramNames: string[],
25-
): URLSearchParams {
26-
const toDelete = [];
27-
const urlObj = new URL(url, window.location.toString());
28-
const keysLower = paramNames.map((p) => p.toLowerCase());
29-
for (const param of urlObj.searchParams.keys()) {
30-
if (keysLower.indexOf(param.toLowerCase()) > -1) {
31-
toDelete.push(param);
32-
}
33-
}
34-
toDelete.map((param) => urlObj.searchParams.delete(param));
35-
return urlObj.searchParams;
36-
}

packages/maplibre/lib/map/create-map.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
FEATURE_COLLECTION_POLYGON_FIXTURE_4326,
2020
} from "@geospatial-sdk/core/fixtures/geojson.fixtures";
2121
import { PartialStyleSpecification } from "../maplibre.models";
22-
import { GeoJSONSource, RasterSourceSpecification } from "maplibre-gl";
22+
import { RasterSourceSpecification } from "maplibre-gl";
2323

2424
describe("MapContextService", () => {
2525
describe("#createLayer", () => {
@@ -220,7 +220,7 @@ describe("MapContextService", () => {
220220
expect(id).toBe("ms:commune_actuelle_3857");
221221
expect(source.data).toEqual(FEATURE_COLLECTION_POLYGON_FIXTURE_4326);
222222
});
223-
it("create 3 layerS", () => {
223+
it("create a layer", () => {
224224
expect(style.layers).toBeTruthy();
225225
expect(style.layers.length).toBe(1);
226226
const layer = style.layers[0] as RasterLayerSpecification;

packages/maplibre/lib/map/create-map.ts

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export async function createLayer(
3939
crs: "EPSG:3857",
4040
});
4141
url = removeSearchParams(url, ["bbox"]);
42-
url = `${url.toString()}&bbox={bbox-epsg-3857}`;
42+
url = `${url.toString()}&BBOX={bbox-epsg-3857}`;
4343

4444
const dataset: Dataset = {
4545
sources: {
@@ -66,8 +66,7 @@ export async function createLayer(
6666
asJson: true,
6767
outputCrs: "EPSG:4326",
6868
});
69-
const geojson = await fetchGeoJson(url);
70-
return createDatasetFromGeoJsonLayer(layerModel, geojson!);
69+
return createDatasetFromGeoJsonLayer(layerModel, url);
7170
}
7271
case "geojson": {
7372
let geojson;
@@ -93,18 +92,12 @@ export async function createLayer(
9392
let layerUrl: string;
9493
if (layerModel.useTiles) {
9594
console.warn("[Warning] OGC API - Tiles not yet implemented.");
96-
// if (layerModel.useTiles === "vector") {
97-
// } else if (layerModel.useTiles === "map") {
98-
// }
9995
} else {
10096
layerUrl = await ogcEndpoint.getCollectionItemsUrl(
10197
layerModel.collection,
10298
{ ...layerModel.options, asJson: true },
10399
);
104-
const geojson = await fetchGeoJson(layerUrl).catch(
105-
() => featureCollection,
106-
);
107-
return createDatasetFromGeoJsonLayer(layerModel, geojson);
100+
return createDatasetFromGeoJsonLayer(layerModel, layerUrl);
108101
}
109102
break;
110103
}
@@ -117,7 +110,7 @@ export async function createLayer(
117110
}
118111

119112
/**
120-
* Create an OpenLayers map from a context; optionally specify a target (root element) for the map
113+
* Create an Maplibre map from a context; optionally specify a target (root element) for the map
121114
* @param context
122115
* @param target
123116
*/
@@ -158,13 +151,3 @@ export async function resetMapFromContext(
158151
}
159152
return map;
160153
}
161-
162-
async function fetchGeoJson(url: string): Promise<FeatureCollection> {
163-
const response = await fetch(url);
164-
if (!response.ok) {
165-
throw new Error(
166-
`[Error] Maplibre.util:: ${response.status} ${response.statusText}`,
167-
);
168-
}
169-
return await response.json();
170-
}

packages/maplibre/lib/map/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export { createMapFromContext } from "./create-map";
1+
export { createMapFromContext, resetMapFromContext } from "./create-map";
22
export { applyContextDiffToMap } from "./apply-context-diff";

0 commit comments

Comments
 (0)