Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • pub/geomatique/descartes/demo/d-demomap
1 result
Select Git revision
Show changes
Commits on Source (2)
{ {
"name": "d-demomap", "name": "d-demomap",
"version": "1.0.0", "version": "1.1.0-RC1",
"license": "SEE LICENSE IN LICENSE.txt", "license": "SEE LICENSE IN LICENSE.txt",
"scripts": { "scripts": {
"start": "npm run write-settings && webpack-dev-server", "start": "npm run write-settings && webpack-dev-server",
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
"@babel/polyfill": "^7.6.0", "@babel/polyfill": "^7.6.0",
"@babel/preset-env": "^7.4.5", "@babel/preset-env": "^7.4.5",
"lodash": "4.17.11", "lodash": "4.17.11",
"@descartes/d-map": "6.0.0", "@descartes/d-map": "6.1.0-RC1",
"@descartes/d-editmap": "6.0.0", "@descartes/d-editmap": "6.1.0-RC1",
"@descartes/d-inkmap": "6.0.0", "@descartes/d-inkmap": "6.1.0-RC1",
"@descartes/d-geoplateforme": "6.0.0-RC2", "@descartes/d-geoplateforme": "6.0.0-RC2",
"geostyler-openlayers-parser": "2.4.0", "geostyler-openlayers-parser": "2.4.0",
"babel-loader": "^8.0.6", "babel-loader": "^8.0.6",
......
...@@ -177,6 +177,13 @@ ...@@ -177,6 +177,13 @@
rel="noreferrer noopener" rel="noreferrer noopener"
>Couches Descartes Cluster</a >Couches Descartes Cluster</a
> >
<a
class="dropdown-item"
data-link="content_vectortile"
href="?contentType=vectortile"
rel="noreferrer noopener"
>Couches VectorTile</a
>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<center><h4 class="dropdown-header"><b>Couches d'édition</b></h4></center> <center><h4 class="dropdown-header"><b>Couches d'édition</b></h4></center>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
......
...@@ -11,6 +11,7 @@ import {getInitContextEditionKml} from './initcontext_editionkml' ...@@ -11,6 +11,7 @@ import {getInitContextEditionKml} from './initcontext_editionkml'
import {getInitContextEditionGeoJson} from './initcontext_editiongeojson' import {getInitContextEditionGeoJson} from './initcontext_editiongeojson'
import {getInitContextVide} from './initcontext_vide' import {getInitContextVide} from './initcontext_vide'
import {getInitContextGeoplateforme} from './initcontext_geoplateforme' import {getInitContextGeoplateforme} from './initcontext_geoplateforme'
import {getInitContextVectortile} from './initcontext_vectortile'
import { import {
setMapTitle, setMapTitle,
setVersionLabel, setVersionLabel,
...@@ -98,6 +99,8 @@ export async function initialize(descartes) { ...@@ -98,6 +99,8 @@ export async function initialize(descartes) {
context = getInitContextCarto2(); context = getInitContextCarto2();
} else if (additionalParams.contentType === "geoplateforme") { } else if (additionalParams.contentType === "geoplateforme") {
context = getInitContextGeoplateforme(); context = getInitContextGeoplateforme();
} else if (additionalParams.contentType === "vectortile") {
context = getInitContextVectortile();
} else if (additionalParams.contentType === "vide") { } else if (additionalParams.contentType === "vide") {
context = getInitContextVide(); context = getInitContextVide();
} else if (additionalParams.contentType === "geojson") { } else if (additionalParams.contentType === "geojson") {
...@@ -150,6 +153,14 @@ export function initializeMap(descartes,dcontext,dMap, contentType) { ...@@ -150,6 +153,14 @@ export function initializeMap(descartes,dcontext,dMap, contentType) {
context.mapContent.items.unshift(coucheAnnotations); context.mapContent.items.unshift(coucheAnnotations);
} }
} }
if (contentType === "vectortile") {
//switch open panel
document.body.querySelector('#Legend').className = "";
document.body.querySelector('#legendBtn').className = "";
document.body.querySelector('#mapContentBtn').className = "active";
document.body.querySelector('#mapContent').className = "show";
}
} else { } else {
//switch open panel //switch open panel
document.body.querySelector('#Legend').className = ""; document.body.querySelector('#Legend').className = "";
......
This diff is collapsed.