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 gppvtile example #1100

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix gppvtile example #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08bdb06
updated links to chroma JS library
prusswan Sep 3, 2024
39529a7
properly apply style changes to the vector layer:
prusswan Sep 3, 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
24 changes: 12 additions & 12 deletions examples/layer/map.layer.bdtopo.vtile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<!--
Copyright (c) 2019 Jean-Marc VIGLINO,
Copyright (c) 2019 Jean-Marc VIGLINO,
released under CeCILL-B (french BSD like) licence: http://www.cecill.info/

https://vectortiles.ign.fr/demonstrateur/
http://calac-4.ign.fr/pyramide_ecran/demonstrateur.html

Documentation:
https://geoservices.ign.fr/documentation/services/api-et-services-ogc/tuiles-vectorielles-tmswmts
-->
Expand All @@ -27,7 +27,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">

<!-- chroma.js -->
<script type="text/javascript" src="https://gka.github.io/chroma.js/libs/chroma.min.js"></script>
<script type="text/javascript" src="https://gka.github.io/chroma.js/libs/chroma.min.cjs"></script>
<!-- Spectrum -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.6.2/spectrum.min.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.6.1/spectrum.min.css" />
Expand All @@ -38,7 +38,7 @@
<link rel="stylesheet" href="https://openlayers.org/en/v6.3.1/css/ol.css" />
<script type="text/javascript" src="https://openlayers.org/en/v6.3.1/build/ol.js"></script>


<!-- ol-ext -->
<link rel="stylesheet" href="../../dist/ol-ext.css" />
<script type="text/javascript" src="../../dist/ol-ext.js"></script>
Expand All @@ -54,7 +54,7 @@
right: 0;
}
</style>

</head>
<body >
<a href="https://github.com/Viglino/ol-ext" class="icss-github-corner"><i></i></a>
Expand All @@ -69,7 +69,7 @@ <h1>ol-ext: Geoportail vector tile</h1>

<!-- DIV pour la carte -->
<div id="map"></div>

<script>
// The map
var map = new ol.Map({
Expand Down Expand Up @@ -121,7 +121,7 @@ <h1>ol-ext: Geoportail vector tile</h1>
return new ol.geom.Point(f.getGeometry().getFirstCoordinate())
}
}))
var select = new ol.layer.Vector({
var select = new ol.layer.Vector({
source: new ol.source.Vector(),
style: selStyle
});
Expand All @@ -145,7 +145,7 @@ <h1>ol-ext: Geoportail vector tile</h1>
hover.setActive(b);
}

var hover = new ol.interaction.Hover({
var hover = new ol.interaction.Hover({
cursor: "pointer",
layers: [vlayer]
});
Expand All @@ -169,7 +169,7 @@ <h1>ol-ext: Geoportail vector tile</h1>
}
tooltip.setInfo(info);
//console.log(feature.getProperties());
// Select feature
// Select feature
if (showGeom) {
var coords = [];
if (feature instanceof ol.Feature) {
Expand All @@ -189,7 +189,7 @@ <h1>ol-ext: Geoportail vector tile</h1>
coords = coords;
break;
}
case 'MultiLineString' :
case 'MultiLineString' :
case 'Polygon' : {
coords = [coords];
break;
Expand All @@ -208,6 +208,6 @@ <h1>ol-ext: Geoportail vector tile</h1>
});

</script>

</body>
</html>
14 changes: 7 additions & 7 deletions examples/layer/map.layer.gppvtile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<!--
Copyright (c) 2019 Jean-Marc VIGLINO,
Copyright (c) 2019 Jean-Marc VIGLINO,
released under CeCILL-B (french BSD like) licence: http://www.cecill.info/

https://vectortiles.ign.fr/demonstrateur/
http://calac-4.ign.fr/pyramide_ecran/demonstrateur.html

Documentation:
https://geoservices.ign.fr/documentation/services_betas/vecteur-tuile.html
https://geoservices.ign.fr/documentation/geoservices/vecteur-tuile.html
Expand All @@ -28,7 +28,7 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">

<!-- chroma.js -->
<script type="text/javascript" src="https://gka.github.io/chroma.js/libs/chroma.min.js"></script>
<script type="text/javascript" src="https://gka.github.io/chroma.js/libs/chroma.min.cjs"></script>
<!-- Spectrum -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.6.2/spectrum.min.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.6.1/spectrum.min.css" />
Expand All @@ -39,7 +39,7 @@
<link rel="stylesheet" href="https://openlayers.org/en/v6.3.1/css/ol.css" />
<script type="text/javascript" src="https://openlayers.org/en/v6.3.1/build/ol.js"></script>


<!-- ol-ext -->
<link rel="stylesheet" href="../../dist/ol-ext.css" />
<script type="text/javascript" src="../../dist/ol-ext.js"></script>
Expand All @@ -50,7 +50,7 @@

<link rel="stylesheet" href="../style.css" />
<link rel="stylesheet" href="./map.layer.gppvtile.css" />

</head>
<body >
<a href="https://github.com/Viglino/ol-ext" class="icss-github-corner"><i></i></a>
Expand Down Expand Up @@ -110,7 +110,7 @@ <h2>Choisir une couleur</h2>
<option value="color" style="display: none;">user color</option>
<option value="color">user color</option>
</select>

<script src="./map.layer.gppvtile.js"></script>

</body>
Expand Down
25 changes: 17 additions & 8 deletions examples/layer/map.layer.gppvtile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ function applyStyle() {
if (l.paint[c].stops) {
l.paint[c].stops.forEach(function (s) {
if (!(/#ffffff/i.test(s[1]) && /^saturate/.test(operation))) {
s[1] = getChromaColor(chroma(s[1])[operation](opt));
s[1] = getChromaColor(chroma(s[1])[operation](opt));
}
// console.log('STOP:',s)
})
Expand All @@ -245,20 +245,29 @@ function applyStyle() {
try {
if (l.paint[c].stops) {
l.paint[c].stops.forEach(function (s) {
s[1] = getChromaColor(chroma.mix(s[1],color));
s[1] = getChromaColor(chroma.mix(s[1],color));
})
} else {
l.paint[c] = getChromaColor(chroma.mix(l.paint[c],color));
l.paint[c] = getChromaColor(chroma.mix(l.paint[c],color));
}
} catch(e) {};
break;
break;
}
}
}
});
})
}
}

// trigger tile refresh by incrementing style id, see: https://github.com/openlayers/ol-mapbox-style/issues/959
try {
currentStyle["id"] = currentStyle["id"] + 1;
}
catch {
currentStyle["id"] = 0;
}

olms.applyStyle(vlayer, currentStyle, "plan_ign");
}

Expand Down Expand Up @@ -367,7 +376,7 @@ selStyle.push(new ol.style.Style({
return new ol.geom.Point(f.getGeometry().getFirstCoordinate())
}
}))
var select = new ol.layer.Vector({
var select = new ol.layer.Vector({
source: new ol.source.Vector(),
style: selStyle
});
Expand All @@ -383,7 +392,7 @@ map.on('click', function() {
var tooltip = new ol.Overlay.Tooltip({ className: 'default', positioning: 'bottom-center' });
map.addOverlay(tooltip);

var hover = new ol.interaction.Hover({
var hover = new ol.interaction.Hover({
cursor: "pointer",
layers: [vlayer]
});
Expand All @@ -407,7 +416,7 @@ hover.on("enter", function(e) {
}
tooltip.setInfo(info);
//console.log(feature.getProperties());
// Select feature
// Select feature
if (showGeom) {
var coords = [];
if (feature instanceof ol.Feature) {
Expand All @@ -427,7 +436,7 @@ hover.on("enter", function(e) {
coords = coords;
break;
}
case 'MultiLineString' :
case 'MultiLineString' :
case 'Polygon' : {
coords = [coords];
break;
Expand Down