Merge pull request #361 from mviewer/develop

Version 4.2
mviewer · Jan 15, 2025 · 431ca39 · 431ca39
2 parents 7e35d91 + 8d43933
commit 431ca39
Show file tree

Hide file tree

Showing 120 changed files with 6,657 additions and 2,419 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3"
+    python: "3.12"
     # You can also specify other tool versions:
     # nodejs: "20"
     # rust: "1.70"
@@ -31,4 +31,4 @@ formats:
 # See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
   install:
-  - requirements: docs/requirements.txt
+  - requirements: docs/requirements.txt
diff --git a/config-php-sample.json b/config-php-sample.json
@@ -1,8 +1,8 @@
 {
     "app_conf": {
         "studio_title": "GéoBretagne mviewer studio",
-        "mviewer_version":  "3.12",
-        "mviewerstudio_version":  "4.1",
+        "mviewer_version":  "3.13",
+        "mviewerstudio_version":  "4.2",
         "is_php": "true",
         "php": {
             "upload_service": "srv/php/store.php",
@@ -133,6 +133,7 @@
                 "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:google",
                 "format": "image/png",
+                "fromcapacity": "false",
                 "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>",
                 "style": "normal",
                 "matrixset": "PM",
@@ -147,6 +148,7 @@
                 "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:grey",
                 "format": "image/png",
+                "fromcapacity": "false",
                 "attribution": "GéoBretagne - GéoGrandEst. 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>",
                 "style": "normal",
                 "matrixset": "PM",

diff --git a/config-python-sample.json b/config-python-sample.json
@@ -1,8 +1,8 @@
 {
     "app_conf": {
         "studio_title": "Mviewer Studio",
-        "mviewer_version":  "3.12",
-        "mviewerstudio_version":  "4.1",
+        "mviewer_version":  "3.13",
+        "mviewerstudio_version":  "4.2",
         "api": "api/app",
         "store_style_service": "api/style",
         "mviewer_instance": "/mviewer/",
@@ -127,6 +127,7 @@
                 "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:google",
                 "format": "image/png",
+                "fromcapacity": "false",
                 "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>",
                 "style": "normal",
                 "matrixset": "PM",
@@ -141,6 +142,7 @@
                 "url": "https://tile.geobretagne.fr/osm/service",
                 "layers": "osm:grey",
                 "format": "image/png",
+                "fromcapacity": "false",
                 "attribution": "GéoBretagne - GéoGrandEst. 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>",
                 "style": "normal",
                 "matrixset": "PM",

diff --git a/css/bootstrap.css b/css/bootstrap.css
@@ -3850,9 +3850,9 @@ input[type="button"].btn-block {
 .list-group-item {
   position: relative;
   display: block;
-  padding: 0.9rem 1.25rem;
+  padding: 0.5rem 0.75rem;
   background-color: #fff;
-  border: 1px solid rgba(0, 0, 0, 0.125); }
+}
   .list-group-item:first-child {
     border-top-left-radius: inherit;
     border-top-right-radius: inherit; }