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.

Sign up for GitHub

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(Widgets): ID configurable pour tous les widgets #284

Merged
merged 6 commits into from
Dec 9, 2024
Merged

fix(Widgets): ID configurable pour tous les widgets #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0dbc488
Test de ID unique pour tous les widgets
lowzonenose Nov 4, 2024
bd9d392
Merge branch 'main' into feature/uid-common-widgets
lowzonenose Nov 27, 2024
c7a1eda
Merge branch 'main' into feature/uid-common-widgets
lowzonenose Dec 5, 2024
2d16eb6
fix exemples
lowzonenose Dec 5, 2024
7442557
maj version package
lowzonenose Dec 9, 2024
43ec5f3
jsdoc
lowzonenose Dec 9, 2024
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: 3 additions & 2 deletions DRAFT_CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ __DATE__

* 🔨 [Changed]

* Drawing : migration de l'outil en DSFR (#288)
* Drawing : Migration de l'outil en DSFR (#288)
* Widgets : Possibilité de configurer l'ID du widget (#284)

* 🔥 [Deprecated]

* 🔥 [Removed]

* 🐛 [Fixed]

* Territories : optimisation des ressources du widget (#278)
* Territories : Optimisation des ressources du widget (#278)
* Utilisation de l'attribut *data-url* pour charger la configuration en mode browser (#290)

* 🔒 [Security]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "geopf-extensions-openlayers",
"description": "French Geoportal Extensions for OpenLayers libraries",
"version": "1.0.0-beta.0-292",
"version": "1.0.0-beta.0-284",
"date": "02/12/2024",
"module": "src/index.js",
"directories": {},
Expand Down
14 changes: 7 additions & 7 deletions samples-src/pages/tests/Default/pages-ol-modules-dsfr-default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ <h2>Ajout de tous les widgets</h2>

{{#content "js"}}
<script type="text/javascript">
const scaleControl = new ol.control.ScaleLine({
units: 'metric',
bar: false,
});

var createMap = function () {
// on cache l'image de chargement du Géoportail.
document.getElementById("map").style.backgroundImage = "none";
Expand All @@ -93,7 +90,10 @@ <h2>Ajout de tous les widgets</h2>
})
});


const scaleControl = new ol.control.ScaleLine({
units: 'metric',
bar: false,
});
map.addControl(scaleControl);

var catalog = new ol.control.Catalog({
Expand Down Expand Up @@ -161,7 +161,7 @@ <h2>Ajout de tous les widgets</h2>
map.addControl(route);

var feature = new ol.control.GetFeatureInfo({
position : "top-left"
position : "top-left"
});
map.addControl(feature);

Expand All @@ -185,7 +185,7 @@ <h2>Ajout de tous les widgets</h2>

var measureArea = new ol.control.MeasureArea({
position : "top-left",
listable : true,
listable : true
});
map.addControl(measureArea);

Expand Down
264 changes: 264 additions & 0 deletions samples-src/pages/tests/Default/pages-ol-modules-dsfr-id-fixe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
{{#extend "ol-sample-modules-dsfr-layout"}}

{{#content "vendor"}}

<script src="{{ baseurl }}/dist/modules/GpfExtOlCRS.js"></script>
<script src="{{ baseurl }}/dist/modules/GpfExtOlLayers.js"></script>
<script src="{{ baseurl }}/dist/modules/GpfExtOlLayers.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlLayerSwitcher.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlLayerSwitcher.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlDrawing.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlDrawing.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlIsocurve.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlIsocurve.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlLayerImport.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlLayerImport.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGeoportalMousePosition.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGeoportalMousePosition.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlRoute.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlRoute.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlReverseGeocode.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlReverseGeocode.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlSearchEngine.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlSearchEngine.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGetFeatureInfo.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGetFeatureInfo.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlMeasureLength.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlMeasureLength.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlMeasureArea.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlMeasureArea.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlMeasureAzimuth.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlMeasureAzimuth.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlElevationPath.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlElevationPath.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGeoportalAttribution.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGeoportalAttribution.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGeoportalZoom.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGeoportalZoom.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGeoportalFullScreen.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGeoportalFullScreen.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlGeoportalOverviewMap.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlGeoportalOverviewMap.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlCatalog.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlCatalog.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlLegends.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlLegends.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlTerritories.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlTerritories.js"></script>
<link rel="stylesheet" href="{{ baseurl }}/dist/modules/GpfExtOlControlList.css" />
<script src="{{ baseurl }}/dist/modules/GpfExtOlControlList.js"></script>
{{/content}}

{{#content "head"}}
<title>Sample openlayers</title>
{{/content}}

{{#content "style"}}
<style>
div#map {
width: 100%;
height: 700px;
}
</style>
{{/content}}

{{#content "body"}}
<h2>Ajout de tous les widgets</h2>
<!-- map -->
<div id="map">
</div>
{{/content}}

{{#content "js"}}
<script type="text/javascript">

var createMap = function () {
// on cache l'image de chargement du Géoportail.
document.getElementById("map").style.backgroundImage = "none";

// Création de la map
var map = new ol.Map({
target : "map",
layers : [
new ol.layer.GeoportalWMTS({
layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"
})
],
view : new ol.View({
center : [288074.8449901076, 6247982.515792289],
zoom : 8
})
});

const scaleControl = new ol.control.ScaleLine({
units: 'metric',
bar: false,
});
map.addControl(scaleControl);

var catalog = new ol.control.Catalog({
id: 1,
draggable: true,
position : "top-left"
});
map.addControl(catalog);

var zoom = new ol.control.GeoportalZoom({
id: 2,
position : "top-right"
});
map.addControl(zoom);

var fullscreen = new ol.control.GeoportalFullScreen({
id: 3,
position : "top-right"
});
map.addControl(fullscreen);

var overview = new ol.control.GeoportalOverviewMap({
id: 4,
position : "bottom-left",
collapsed: false
});
map.addControl(overview);

var drawing = new ol.control.Drawing({
id: 5,
draggable: true,
position : "bottom-left"
});
map.addControl(drawing);

var iso = new ol.control.Isocurve({
id: 6,
draggable: true,
position : "bottom-left"
});
map.addControl(iso);

var layerImport = new ol.control.LayerImport({
id: 7,
draggable: true,
position : "bottom-left"
});
map.addControl(layerImport);

var layerSwitcher = new ol.control.LayerSwitcher({
options : {
id: 8,
panel: true,
draggable: true,
position : "top-right",
counter : true,
}
});
map.addControl(layerSwitcher);

var mp = new ol.control.GeoportalMousePosition({
id: 9,
draggable: true,
position : "bottom-right"
});
map.addControl(mp);

var route = new ol.control.Route({
id: 10,
draggable: true,
position : "bottom-right",
listable: true,
description: "Calculez un itinéraire véhicule ou piéton entre deux ou plusieurs points",
});
map.addControl(route);

var feature = new ol.control.GetFeatureInfo({
id: 11,
position : "top-left"
});
map.addControl(feature);

var reverse = new ol.control.ReverseGeocode({
id: 12,
draggable: true,
position : "top-right",
listable: true,
});
map.addControl(reverse);

var search = new ol.control.SearchEngine({
id: 13,
position : "top-left",
splitResults : false,
});
map.addControl(search);

var measureLength = new ol.control.MeasureLength({
id: 14,
position : "top-left"
});
map.addControl(measureLength);

var measureArea = new ol.control.MeasureArea({
id: 15,
position : "top-left",
listable : true
});
map.addControl(measureArea);

var measureAzimuth = new ol.control.MeasureAzimuth({
id: 16,
position : "top-left"
});
map.addControl(measureAzimuth);

var measureProfil = new ol.control.ElevationPath({
id: 17,
position : "top-left"
});
map.addControl(measureProfil);

var attributions = new ol.control.GeoportalAttribution();
map.addControl(attributions);

var legends = new ol.control.Legends({
id: 18,
draggable: true,
position: "bottom-left",
panel: true,
auto: true
});
map.addControl(legends);

var territories = new ol.control.Territories({
id: 19,
draggable: true,
position: "bottom-left",
direction: "vertical",
panel: true,
auto: true,
listable: true,
});
map.addControl(territories);

var controlList = new ol.control.ControlList({
id: 20,
draggable: false,
position: "bottom-right",
controlCatalogElement: document.getElementById("sampleLightDark"),
});
map.addControl(controlList);
};

Gp.Services.getConfig({
customConfigFile : "{{ configurl }}",
callbackSuffix : "",
// apiKey: "{{ apikey }}",
timeOut : 20000,
onSuccess : createMap,
onFailure : (e) => {
console.error(e);
}
});

</script>
{{/content}}
{{/extend}}
Loading