Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

vMap
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

88d8d183

Commit 88d8d183 authored 6 years ago by Armand Bahi

Downloads
- Patches
- Plain Diff

Merge branch 'next_version' into evolution/60-ajout-de-plusieurs-documents-simultanes

parent 6a45d4f8

No related branches found

No related tags found

Loading

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

module/javascript/app/vmap/mapmanager/layerstree.js 71 additions, 26 deletions

module/javascript/app/vmap/mapmanager/layerstree.js
module/javascript/app/vmap/mapmanager/mapmanager.js 40 additions, 0 deletions

module/javascript/app/vmap/mapmanager/mapmanager.js
module/javascript/app/vmap/tools/location.js 7 additions, 5 deletions

module/javascript/app/vmap/tools/location.js
module/javascript/app/vmap/tools/measure.js 1 addition, 1 deletion

module/javascript/app/vmap/tools/measure.js
module/javascript/app/vmap/tools/print.js 10 additions, 0 deletions

module/javascript/app/vmap/tools/print.js
module/template/layers/layertree.html 25 additions, 7 deletions

module/template/layers/layertree.html
module/template/tools/location.html 2 additions, 2 deletions

module/template/tools/location.html
web_service/sql/sqlQueries.xml 5 additions, 0 deletions

web_service/sql/sqlQueries.xml
web_service/ws/MapJSON.class.inc 45 additions, 0 deletions

web_service/ws/MapJSON.class.inc

with 206 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment