Skip to content

Commit

Permalink
Merge pull request #153 from mviewer/develop
Browse files Browse the repository at this point in the history
Release 3.2
  • Loading branch information
lecault authored Feb 6, 2023
2 parents 66f6deb + ba6fbaa commit 29cce1b
Show file tree
Hide file tree
Showing 126 changed files with 19,485 additions and 1,597 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ __pycache__/
srv/python/mviewerstudio_backend/static

# pyenv
.python-version
.python-version
?venv/
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# mviewerstudio

mviewer studio est une application web dont le but est de faciliter la création d'une configuration pour [mviewer](https://github.com/geobretagne/mviewer) à l'aide d'une interface graphique ergonomique et simple.
mviewer studio est une application web dont le but est de faciliter la création d'une configuration pour [mviewer](https://github.com/mviewer/mviewer) à l'aide d'une interface graphique ergonomique et simple.

Application écrite en Javascript pour le front.
2 backends disponibles : écrits en Python pour l'un et en PHP pour l'autre.

Référez-vous à la documentation pour plus d'information :

* [Documentation utilisateur](doc/user.md)
* [Documentation d'installation](doc/install.md)
* [Documentation administrateur](doc/admin.md)
* [Documentation utilisateur](https://mviewerstudio.readthedocs.io/fr/stable/doc_user/accueil.html)
* [Documentation d'installation](https://mviewerstudio.readthedocs.io/fr/stable/doc_tech/install.html)
* [Documentation administrateur](https://mviewerstudio.readthedocs.io/fr/stable/doc_tech/config.html)
182 changes: 182 additions & 0 deletions config-python-sample.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
{
"app_conf": {
"studio_title": "Mviewer STudio Megalis",
"upload_service": "srv/store",
"delete_service": "srv/delete",
"list_service": "srv/list",
"store_style_service": "srv/store/style",
"mviewer_instance": "/mviewer/",
"conf_path_from_mviewer": "apps/store/",
"mviewer_short_url": {
"used": true,
"apps_folder": "store"
},
"external_themes": {
"used": true,
"url": "https://geobretagne.fr/minicatalog/csv"
},
"user_info": "srv/user_info",
"export_conf_folder": "/home/debian/mviewer/apps/store/",
"proxy": "",
"user_info_visible": false,
"app_form_placeholders": {
"app_title": "Kartenn",
"logo_url": "https://geobretagne.fr/pub/logo/region-bretagne.jpg",
"help_file": "mviewer_help.html"
},
"map": {
"center": [-307903.74898791354, 6141345.088741366],
"zoom": 7
},
"baselayers": {
"positron": {
"id": "positron",
"thumbgallery": "img/basemap/positron.png",
"title": "CartoDb",
"label": "Positron",
"type": "OSM",
"url": "https://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"attribution": "Map tiles by <a href=\"https://cartodb.com/attributions\">CartoDb</a>, under <a href=\"https://creativecommons.org/licenses/by/3.0/\">CC BY 3.0 </a>"
},
"ortho_ign": {
"id": "ortho_ign",
"thumbgallery": "img/basemap/ortho.jpg",
"title": "IGN",
"label": "Photographies aériennes IGN",
"type": "WMTS",
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
"layers": "ORTHOIMAGERY.ORTHOPHOTOS",
"format": "image/jpeg",
"fromcapacity": "false",
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
"style": "normal",
"matrixset": "PM",
"maxzoom": "22"
},
"darkmatter": {
"id": "darkmatter",
"thumbgallery": "img/basemap/darkmatter.png",
"title": "CartoDb",
"label": "Dark Matter",
"type": "OSM",
"url": "https://{a-c}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png",
"maxzoom": "20",
"attribution": "Map tiles by <a href=\"https://cartodb.com/attributions\">CartoDb</a>, under <a href=\"https://creativecommons.org/licenses/by/3.0/\">CC BY 3.0 </a>"
},
"esriworldimagery": {
"id": "esriworldimagery",
"thumbgallery": "img/basemap/esriworldwide.jpg",
"title": "Esri",
"label": "Esri world imagery",
"type": "OSM",
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
},
"ortho1": {
"id": "ortho1",
"thumbgallery": "img/basemap/ortho.jpg",
"title": "GéoBretagne",
"label": "Photo aérienne actuelle GéoBretagne",
"type": "WMTS",
"url": "https://tile.geobretagne.fr/gwc02/service/wmts",
"layers": "satellite",
"format": "image/png",
"style": "_null",
"matrixset": "EPSG:3857",
"fromcapacity": "false",
"attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/3a0ac2e3-7af1-4dec-9f36-dae6b5a8c731\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN - PlanetObserver</a>"
},
"ortho_ir": {
"id": "ortho_ir",
"thumbgallery": "img/basemap/ir.jpg",
"title": "GéoBretagne",
"label": "Photo aérienne infra rouge GéoBretagne",
"type": "WMTS",
"url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
"layers": "photo:ir-composite",
"format": "image/jpeg",
"style": "_null",
"matrixset": "EPSG:3857",
"fromcapacity": "false",
"attribution": "<a href=\"https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/434b82a8-8d3c-4d9f-9eb3-0485f1a63eb6\" target=\"_blank\" >partenaires GéoBretagne - Megalis Bretagne - IGN</a>"
},
"osm_google": {
"id": "osm_google",
"thumbgallery": "img/basemap/osm_google.png",
"title": "GéoBretagne",
"label": "OpenStreetMap GéoBretagne",
"type": "WMS",
"url": "https://osm.geobretagne.fr/gwc01/service/wms",
"layers": "osm:google",
"format": "image/png",
"attribution": "GéoBretagne. Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a>, <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
},
"osm": {
"id": "osm",
"thumbgallery": "img/basemap/osm.png",
"title": "OSM",
"label": "OpenStreetMap",
"type": "OSM",
"url": "https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png",
"attribution": "Données : les contributeurs d'<a href=\"https://www.openstreetmap.org/\" target=\"_blank\">OpenStreetMap </a><a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">ODbL </a>"
},
"osm_bzh": {
"id": "osm_bzh",
"thumbgallery": "img/basemap/osm.png",
"title": "OSM BZH",
"label": "OpenStreetMap en breton",
"type": "OSM",
"maxzoom": "20",
"url": "https://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
"attribution": "Kendaolerien <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">OpenStreetMap</a>"
},
"plan_ign": {
"id": "plan_ign",
"thumbgallery": "img/basemap/scan-express.jpg",
"title": "IGN",
"label": "Plan IGN v2",
"type": "WMTS",
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
"layers": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
"format": "image/png",
"fromcapacity": "false",
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
"style": "normal",
"matrixset": "PM",
"maxzoom": "22"
}
},
"data_providers": {
"csw": [{
"title": "Catalogue GéoBretagne",
"url": "https://geobretagne.fr/geonetwork/srv/fre/csw",
"baseref": "https://geobretagne.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
},
{
"title": "Catalogue Région Bretagne",
"url": "https://kartenn.region-bretagne.fr/geonetwork/srv/fre/csw",
"baseref": "https://kartenn.region-bretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/"
},
{
"title": "Catalogue de la Région Grand Est",
"url": "https://www.geograndest.fr/geonetwork/srv/fre/csw",
"baseref": "https://www.geograndest.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
},
{
"title": "Catalogue de la Région Pays de la Loire",
"url": "https://www.geopal.org/geonetwork/srv/fre/csw",
"baseref": "https://www.geopal.org/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
}
],
"wms": [{
"title": "Serveur WMS de la Région",
"url": "https://ows.region-bretagne.fr/geoserver/rb/wms"
}]
},
"default_params": {
"layer": {
"info_format": "text/html"
}
}
}
}
52 changes: 26 additions & 26 deletions config-sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,20 @@
"url": "https://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"attribution": "Map tiles by <a href=\"https://cartodb.com/attributions\">CartoDb</a>, under <a href=\"https://creativecommons.org/licenses/by/3.0/\">CC BY 3.0 </a>"
},
"esriworldimagery": {
"id": "esriworldimagery",
"thumbgallery": "img/basemap/esriworldwide.jpg",
"title": "Esri",
"label": "Esri world imagery",
"type": "OSM",
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
"ortho_ign": {
"id": "ortho_ign",
"thumbgallery": "img/basemap/ortho.jpg",
"title": "IGN",
"label": "Photographies aériennes IGN",
"type": "WMTS",
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
"layers": "ORTHOIMAGERY.ORTHOPHOTOS",
"format": "image/jpeg",
"fromcapacity": "false",
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
"style": "normal",
"matrixset": "PM",
"maxzoom": "22"
},
"darkmatter": {
"id": "darkmatter",
Expand All @@ -57,11 +63,20 @@
"maxzoom": "20",
"attribution": "Map tiles by <a href=\"https://cartodb.com/attributions\">CartoDb</a>, under <a href=\"https://creativecommons.org/licenses/by/3.0/\">CC BY 3.0 </a>"
},
"esriworldimagery": {
"id": "esriworldimagery",
"thumbgallery": "img/basemap/esriworldwide.jpg",
"title": "Esri",
"label": "Esri world imagery",
"type": "OSM",
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"attribution": "<a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\" target=\"_blank\" >Esri world imagery</a>"
},
"ortho1": {
"id": "ortho1",
"thumbgallery": "img/basemap/ortho.jpg",
"title": "GéoBretagne",
"label": "Photo aérienne actuelle",
"label": "Photo aérienne actuelle GéoBretagne",
"type": "WMTS",
"url": "https://tile.geobretagne.fr/gwc02/service/wmts",
"layers": "satellite",
Expand All @@ -75,7 +90,7 @@
"id": "ortho_ir",
"thumbgallery": "img/basemap/ir.jpg",
"title": "GéoBretagne",
"label": "Photo aérienne infra rouge",
"label": "Photo aérienne infra rouge GéoBretagne",
"type": "WMTS",
"url": "https://geobretagne.fr/geoserver/gwc/service/wmts",
"layers": "photo:ir-composite",
Expand All @@ -89,7 +104,7 @@
"id": "osm_google",
"thumbgallery": "img/basemap/osm_google.png",
"title": "GéoBretagne",
"label": "OpenStreetMap",
"label": "OpenStreetMap GéoBretagne",
"type": "WMS",
"url": "https://osm.geobretagne.fr/gwc01/service/wms",
"layers": "osm:google",
Expand Down Expand Up @@ -129,21 +144,6 @@
"style": "normal",
"matrixset": "PM",
"maxzoom": "22"
},
"ortho_ign": {
"id": "ortho_ign",
"thumbgallery": "img/basemap/ortho.jpg",
"title": "IGN",
"label": "Photographies aériennes IGN",
"type": "WMTS",
"url": "https://wxs.ign.fr/choisirgeoportail/geoportail/wmts?",
"layers": "ORTHOIMAGERY.ORTHOPHOTOS",
"format": "image/jpeg",
"fromcapacity": "false",
"attribution": "<a href='https://geoservices.ign.fr' target='_blank'><img src='https://geoservices.ign.fr/images/logoIGN.png'></a>",
"style": "normal",
"matrixset": "PM",
"maxzoom": "22"
}
},
"data_providers": {
Expand Down
53 changes: 53 additions & 0 deletions css/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

$font-family-sans-serif: Poppins, sans-serif;
$font-size-base: 0.9rem;
$primary: rgb(44, 44, 82);
$gray-200: #eaeaea;
$secondary: $gray-200;
$warning: #f5ae54;
$danger: #ff9085;
$success: #2ed2c5;
$info: #934ae4;
$gray-100: #f5f5f5;
$gray-300: #DFDFDF;
$gray-400: #D1D1D1;
$gray-500: #BDBDBD;
$gray-600: rgb(146, 146, 146);
$gray-700: rgb(78, 78, 78);
$gray-900: rgb(34, 36, 36);
$body-color: $gray-700;
$paragraph-margin-bottom: 0.5rem;
$border-radius: 0.6rem;
$border-radius-sm: 0.5rem;
$border-radius-lg: 0.6rem;
$caret-vertical-align: $caret-width * .8;
$input-btn-padding-y: 0.5rem;
$input-btn-focus-width: 0rem;
$badge-font-weight: $font-weight-normal;
$badge-padding-y: 0.4em;
$badge-padding-x: 0.7em;
$close-font-weight: $font-weight-light;
$code-font-size: 88.5%;
$close-font-size: $font-size-base * 2;
$close-color: $gray-700;
$list-group-item-padding-y: 0.9rem;
$badge-pill-padding-x: 0.8em;
$badge-pill-border-radius: 5rem;
$modal-content-border-color: rgba($black, .1);
$navbar-nav-link-padding-x: 0.5rem;
$navbar-padding-y: $spacer / 1;
$component-active-bg: theme-color("info");
$link-color: theme-color("info");
$input-focus-border-color: $gray-100;
$input-focus-bg: $gray-100;
$modal-inner-padding: 1.7rem;
$modal-header-padding-y: 1.7rem;
$modal-header-padding-x: 1.7rem;
$custom-control-indicator-size: 1.2rem;
$custom-control-spacer-x: 1.2rem;
$btn-border-radius: 0.8rem;
$custom-control-gutter: 0.5rem;
$modal-footer-margin-between: 0.5rem;
$input-btn-padding-y-sm: 0.5rem;
$input-btn-padding-x: 1rem;
$input-btn-padding-x-lg: 0.8rem;
Loading

0 comments on commit 29cce1b

Please sign in to comment.